To: vim-dev@vim.org Subject: patch 5.4.39 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.4.39 Problem: When setting a hidden option, spaces before the equal sign were not skipped and cause an error message. E.g., ":set csprg =cmd". Solution: When skipping over a hidden option, check for a following "=val" and skip it too. Files: src/option.c *** ../vim-5.4.38/src/option.c Tue Aug 10 16:10:18 1999 --- src/option.c Fri Aug 20 21:12:33 1999 *************** *** 2591,2600 **** * Advance to next argument. * - skip until a blank found, taking care of backslashes * - skip blanks */ ! while (*arg != NUL && !vim_iswhite(*arg)) ! if (*arg++ == '\\' && *arg != NUL) ! ++arg; } arg = skipwhite(arg); --- 2591,2607 ---- * Advance to next argument. * - skip until a blank found, taking care of backslashes * - skip blanks + * - skip one "=val" argument (for hidden options ":set gfn =xx") */ ! for (i = 0; i < 2 ; ++i) ! { ! while (*arg != NUL && !vim_iswhite(*arg)) ! if (*arg++ == '\\' && *arg != NUL) ! ++arg; ! arg = skipwhite(arg); ! if (*arg != '=') ! break; ! } } arg = skipwhite(arg); *** ../vim-5.4.38/src/version.h Fri Aug 20 21:20:52 1999 --- src/version.h Fri Aug 20 21:23:16 1999 *************** *** 19,26 **** #define VIM_VERSION_MINOR_STR "4" #define VIM_VERSION_BUILD 57 #define VIM_VERSION_BUILD_STR "57" ! #define VIM_VERSION_PATCHLEVEL 38 ! #define VIM_VERSION_PATCHLEVEL_STR "38" /* * 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 39 ! #define VIM_VERSION_PATCHLEVEL_STR "39" /* * 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.38" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.38 (1999 Aug 20)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.38 (1999 Aug 20, compiled " --- 30,35 ---- */ #define VIM_VERSION_NODOT "vim54" #define VIM_VERSION_SHORT "5.4" ! #define VIM_VERSION_MEDIUM "5.4.39" ! #define VIM_VERSION_LONG "VIM - Vi IMproved 5.4.39 (1999 Aug 20)" ! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 5.4.39 (1999 Aug 20, compiled " -- Did you ever see a "Hit any key to continue" message in a music piece? --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /