To: vim-dev@vim.org Subject: patch 5.4.21 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.4.21 Problem: Motif: Toplevel menu ordering was wrong when using tear-off items. Solution: Don't add one to the index for a toplevel menu. Files: src/gui_motif.c *** ../vim-5.4.20/src/gui_motif.c Tue Aug 10 16:10:14 1999 --- src/gui_motif.c Tue Aug 10 16:05:12 1999 *************** *** 330,338 **** XmNbackground, gui.menu_bg_pixel, XmNmnemonic, p_wak[0] == 'n' ? NUL : menu->mnemonic, #if (XmVersion >= 1002) ! /* count the tearoff item (neede for LessTif) */ ! XmNpositionIndex, idx + (tearoff_val == (int)XmTEAR_OFF_ENABLED ! ? 1 : 0), #endif NULL); XmStringFree(label); --- 330,338 ---- XmNbackground, gui.menu_bg_pixel, XmNmnemonic, p_wak[0] == 'n' ? NUL : menu->mnemonic, #if (XmVersion >= 1002) ! /* submenu: count the tearoff item (needed for LessTif) */ ! XmNpositionIndex, idx + (parent != NULL ! && tearoff_val == (int)XmTEAR_OFF_ENABLED ? 1 : 0), #endif NULL); XmStringFree(label); *** ../vim-5.4.20/src/version.h Tue Aug 10 16:10:46 1999 --- src/version.h Tue Aug 10 16:12:51 1999 *************** *** 19,26 **** #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 20 ! #define VIM_VERSION_PATCHLEVEL_STR "20" /* * VIM_VERSION_NODOT is used for the runtime directory name. --- 19,26 ---- #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 21 ! #define VIM_VERSION_PATCHLEVEL_STR "21" /* * VIM_VERSION_NODOT is used for the runtime directory name. *************** *** 30,35 **** */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.20" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.20 (1999 Aug 10)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.20 (1999 Aug 10, compiled " --- 30,35 ---- */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.21" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.21 (1999 Aug 10)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.21 (1999 Aug 10, compiled " -- hundred-and-one symptoms of being an internet addict: 24. You realize there is not a sound in the house and you have no idea where your children are. --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /