From 5f724a18b09f6bac901e9629266dda20f3c758af Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Feb 24 2009 15:15:18 +0000 Subject: - patchlevel 127 --- diff --git a/7.2.127 b/7.2.127 new file mode 100644 index 0000000..662fe0f --- /dev/null +++ b/7.2.127 @@ -0,0 +1,59 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.127 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.127 +Problem: When listing mappings and a wrapping line causes the more prompt, + after typing 'q' there can be another more prompt. (Markus + Heidelberg) +Solution: Set "lines_left" to allow more lines to be displayed. +Files: src/message.c + + +*** ../vim-7.2.126/src/message.c Sun Feb 22 00:58:03 2009 +--- src/message.c Mon Feb 23 04:17:39 2009 +*************** +*** 2553,2559 **** + { + /* Jump to the choices of the dialog. */ + retval = TRUE; +- lines_left = Rows - 1; + } + else + #endif +--- 2553,2558 ---- +*************** +*** 2561,2566 **** +--- 2560,2568 ---- + got_int = TRUE; + quit_more = TRUE; + } ++ /* When there is some more output (wrapping line) display that ++ * without another prompt. */ ++ lines_left = Rows - 1; + break; + + #ifdef FEAT_CLIPBOARD +*** ../vim-7.2.126/src/version.c Tue Feb 24 04:28:40 2009 +--- src/version.c Tue Feb 24 04:35:38 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 127, + /**/ + +-- +The difference between theory and practice, is that in theory, there +is no difference between theory and practice. + + /// 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 d384094..d9da400 100644 --- a/README.patches +++ b/README.patches @@ -153,3 +153,6 @@ Individual patches for Vim 7.2: 2472 7.2.122 invalid mem access if VimResized autocmd changes screen size 1568 7.2.123 ":map" output continues after typing 'q' at more prompt 3127 7.2.124 ":tselect" output continues after typing 'q' at more prompt + 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' diff --git a/vim.spec b/vim.spec index db0aa6e..199756f 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 124 +%define patchlevel 127 Summary: The VIM editor URL: http://www.vim.org/ @@ -190,6 +190,9 @@ 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 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -447,6 +450,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch122 -p0 %patch123 -p0 %patch124 -p0 +%patch125 -p0 +%patch126 -p0 +%patch127 -p0 # install spell files %if %{withvimspell} @@ -905,6 +911,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Feb 24 2009 Karsten Hopp 7.2.127-1 +- patchlevel 127 + * Mon Feb 23 2009 Karsten Hopp 7.2.124-1 - patchlevel 124