diff --git a/7.2.131 b/7.2.131 new file mode 100644 index 0000000..fec2b5e --- /dev/null +++ b/7.2.131 @@ -0,0 +1,83 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.131 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.131 +Problem: When 'keymap' is cleared may still use the cursor highlighting for + when it's enabled. +Solution: Reset 'iminsert' and 'imsearch'. (partly by Dominique Pelle) + Also avoid ":setlocal" for these options have a global effect. +Files: src/option.c + + +*** ../vim-7.2.130/src/option.c Sat Feb 21 20:27:00 2009 +--- src/option.c Wed Mar 4 04:09:51 2009 +*************** +*** 5797,5810 **** + /* load or unload key mapping tables */ + errmsg = keymap_init(); + +! /* When successfully installed a new keymap switch on using it. */ +! if (*curbuf->b_p_keymap != NUL && errmsg == NULL) + { +! curbuf->b_p_iminsert = B_IMODE_LMAP; +! if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) +! curbuf->b_p_imsearch = B_IMODE_LMAP; +! set_iminsert_global(); +! set_imsearch_global(); + # ifdef FEAT_WINDOWS + status_redraw_curbuf(); + # endif +--- 5797,5824 ---- + /* load or unload key mapping tables */ + errmsg = keymap_init(); + +! if (errmsg == NULL) + { +! if (*curbuf->b_p_keymap != NUL) +! { +! /* Installed a new keymap, switch on using it. */ +! curbuf->b_p_iminsert = B_IMODE_LMAP; +! if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) +! curbuf->b_p_imsearch = B_IMODE_LMAP; +! } +! else +! { +! /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */ +! if (curbuf->b_p_iminsert == B_IMODE_LMAP) +! curbuf->b_p_iminsert = B_IMODE_NONE; +! if (curbuf->b_p_imsearch == B_IMODE_LMAP) +! curbuf->b_p_imsearch = B_IMODE_USE_INSERT; +! } +! if ((opt_flags & OPT_LOCAL) == 0) +! { +! set_iminsert_global(); +! set_imsearch_global(); +! } + # ifdef FEAT_WINDOWS + status_redraw_curbuf(); + # endif +*** ../vim-7.2.130/src/version.c Mon Mar 2 02:44:54 2009 +--- src/version.c Wed Mar 4 04:10:32 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 131, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +157. You fum through a magazine, you first check to see if it has a web + address. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/README.patches b/README.patches index d9da400..10d7953 100644 --- a/README.patches +++ b/README.patches @@ -156,3 +156,7 @@ Individual patches for Vim 7.2: 3936 7.2.125 leaking memory when reading XPM bitmap for a sign 4326 7.2.126 when EXITFREE is defined signs and keymaps are not freed 1708 7.2.127 get another more prompt after typing 'q' + 1537 7.2.128 (after 7.2.055) ":lcd" causes invalid session file + 2229 7.2.129 opening command window from input() uses the search history + 12852 7.2.130 Vim may haing until CTRL-C is typed when using CTRL-Z + 2612 7.2.131 using wrong cursor highlighting after clearing 'keymap' diff --git a/vim.spec b/vim.spec index 199756f..841a338 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 127 +%define patchlevel 131 Summary: The VIM editor URL: http://www.vim.org/ @@ -154,45 +154,49 @@ Patch085: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.085 Patch086: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.086 Patch087: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.087 Patch088: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.088 -Patch089: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.089 -Patch090: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.090 -Patch091: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.091 -Patch092: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.092 -Patch093: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.093 -Patch094: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.094 -Patch095: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.095 -Patch096: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.096 -Patch097: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.097 -Patch098: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.098 -Patch099: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.099 -Patch100: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.100 -Patch101: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.101 -Patch102: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.102 -Patch103: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.103 -Patch104: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.104 -Patch105: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.105 -Patch106: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.106 -Patch107: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.107 -Patch108: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.108 -Patch109: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.109 -Patch110: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.110 -Patch111: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.111 -Patch112: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.112 -Patch113: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.113 -Patch114: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.114 -Patch115: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.115 -Patch116: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.116 -Patch117: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.117 -Patch118: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.118 -Patch119: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.119 -Patch120: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.120 -Patch121: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.121 -Patch122: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.122 -Patch123: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.123 -Patch124: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.124 +Patch089: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.089 +Patch090: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.090 +Patch091: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.091 +Patch092: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.092 +Patch093: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.093 +Patch094: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.094 +Patch095: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.095 +Patch096: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.096 +Patch097: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.097 +Patch098: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.098 +Patch099: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.099 +Patch100: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.100 +Patch101: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.101 +Patch102: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.102 +Patch103: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.103 +Patch104: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.104 +Patch105: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.105 +Patch106: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.106 +Patch107: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.107 +Patch108: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.108 +Patch109: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.109 +Patch110: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.110 +Patch111: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.111 +Patch112: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.112 +Patch113: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.113 +Patch114: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.114 +Patch115: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.115 +Patch116: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.116 +Patch117: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.117 +Patch118: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.118 +Patch119: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.119 +Patch120: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.120 +Patch121: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.121 +Patch122: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.122 +Patch123: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.123 +Patch124: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.124 Patch125: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.125 Patch126: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.126 Patch127: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.127 +Patch128: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.128 +Patch129: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.129 +Patch130: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.130 +Patch131: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.131 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -453,6 +457,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch125 -p0 %patch126 -p0 %patch127 -p0 +%patch128 -p0 +%patch129 -p0 +%patch130 -p0 +%patch131 -p0 # install spell files %if %{withvimspell} @@ -912,7 +920,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Feb 24 2009 Karsten Hopp 7.2.127-1 -- patchlevel 127 +- patchlevel 131 * Mon Feb 23 2009 Karsten Hopp 7.2.124-1 - patchlevel 124