From 1f2971e617be883b30e7c3308c0fe0791cda3eca Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Feb 23 2009 14:02:48 +0000 Subject: - patchlevel 124 --- diff --git a/7.2.124 b/7.2.124 new file mode 100644 index 0000000..eca6bec --- /dev/null +++ b/7.2.124 @@ -0,0 +1,122 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.124 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.124 +Problem: Typing 'q' at more prompt for ":tselect" output still displays + more lines, causing another more prompt. (Markus Heidelberg) +Solution: Quit listing tags when 'q' typed. +Files: src/tag.c + + +*** ../vim-7.2.123/src/tag.c Sat Feb 21 22:57:10 2009 +--- src/tag.c Mon Feb 23 00:07:24 2009 +*************** +*** 618,624 **** + taglen_advance(taglen); + MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T)); + +! for (i = 0; i < num_matches; ++i) + { + parse_match(matches[i], &tagp); + if (!new_tag && ( +--- 618,624 ---- + taglen_advance(taglen); + MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T)); + +! for (i = 0; i < num_matches && !got_int; ++i) + { + parse_match(matches[i], &tagp); + if (!new_tag && ( +*************** +*** 655,660 **** +--- 655,662 ---- + } + if (msg_col > 0) + msg_putchar('\n'); ++ if (got_int) ++ break; + msg_advance(15); + + /* print any extra fields */ +*************** +*** 689,694 **** +--- 691,698 ---- + if (msg_col + ptr2cells(p) >= Columns) + { + msg_putchar('\n'); ++ if (got_int) ++ break; + msg_advance(15); + } + p = msg_outtrans_one(p, attr); +*************** +*** 704,709 **** +--- 708,715 ---- + if (msg_col > 15) + { + msg_putchar('\n'); ++ if (got_int) ++ break; + msg_advance(15); + } + } +*************** +*** 734,739 **** +--- 740,747 ---- + { + if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns) + msg_putchar('\n'); ++ if (got_int) ++ break; + msg_advance(15); + + /* skip backslash used for escaping command char */ +*************** +*** 760,771 **** + if (msg_col) + msg_putchar('\n'); + ui_breakcheck(); +- if (got_int) +- { +- got_int = FALSE; /* only stop the listing */ +- break; +- } + } + ask_for_selection = TRUE; + } + #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL) +--- 768,776 ---- + if (msg_col) + msg_putchar('\n'); + ui_breakcheck(); + } ++ if (got_int) ++ got_int = FALSE; /* only stop the listing */ + ask_for_selection = TRUE; + } + #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL) +*** ../vim-7.2.123/src/version.c Sun Feb 22 23:42:08 2009 +--- src/version.c Mon Feb 23 00:51:57 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 124, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +123. You ask the car dealer to install an extra cigarette lighter + on your new car to power your notebook. + + /// 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 6664582..d384094 100644 --- a/README.patches +++ b/README.patches @@ -7,7 +7,7 @@ was sent to the vim-dev maillist. The best is to apply the patches in sequence. This avoids problems when a patch depends on a previous patch. If you did not unpack the -extra archive, you may want to skip patches marked with "extra:". +extra archive, you may want to skip patches marked with "(extra)". Similarly for the "lang" archive. Or ignore errors for missing files. Before patching, change to the top Vim directory, where the "src" @@ -22,6 +22,10 @@ patches for binaries. Checksums for the patch files can be found in the file MD5. +Collection of patches for Vim 7.2: + SIZE NAME INCLUDES +108889 7.2.001-100.gz patches 7.2.001 to 7.2.100, gzip'ed + Individual patches for Vim 7.2: SIZE NAME FIXES @@ -113,3 +117,39 @@ Individual patches for Vim 7.2: 3045 7.2.086 using ":diffget 1" in buffer 1 corrupts the text 1570 7.2.087 adding URL to 'path' doesn't work to edit a file 2895 7.2.088 (extra) Win32: Using the clipboard sometimes fails + 2473 7.2.089 (extra) Win32: crash when using Ultramon buttons + 3286 7.2.090 user command containing 0x80 does not work properly + 2113 7.2.091 ":cs help" output is not aligned for some languages + 4538 7.2.092 some error messages are not translated + 7287 7.2.093 (extra) dialogs can't always handle multi-byte text + 3430 7.2.094 compiler warning for signed/unsigned compare, typos + 1902 7.2.095 using "r" and then CTRL-C Visual highlighting is not removed + 1464 7.2.096 after ":number" "Press Enter" msg may be on the wrong screen + 1692 7.2.097 "!xterm&" doesn't work when 'shell' is "bash" + 1864 7.2.098 warning for signed/unsigned pointer + 3498 7.2.099 unnecessary redraw when changing GUI options in terminal + 3846 7.2.100 missing first three bytes on sourced FIFO + 1362 7.2.101 (extra) MSVC version not recognized + 1496 7.2.102 (after 7.2.100) BOM at start of Vim script not removed + 5153 7.2.103 tab page line isn't always updated, e.g. when 'bomb' is set + 1523 7.2.104 after ":saveas foo" the tab label isn't updated right away + 2159 7.2.105 modeline setting for 'foldmethod' overrules diff options + 3422 7.2.106 endless loop for "]s" in HTML when there are no misspellings + 1825 7.2.107 After a GUI dialog ":echo" messages are deleted + 1622 7.2.108 (after 7.2.105) can't compile without the diff feature + 11901 7.2.109 'langmap' does not work for multi-byte characters + 1407 7.2.110 compiler warning for unused variable + 2724 7.2.111 selection unclear for Visual block mode with 'cursorcolumn' + 1509 7.2.112 cursor invisible in first col in Visual mode if 'number' set + 2700 7.2.113 crash when using submatch() in substitute() + 2531 7.2.114 using wrong printf format: %d instead of %ld + 2716 7.2.115 some debugging code is never used + 1619 7.2.116 not all memory is freed when EXITFREE is defined + 2592 7.2.117 location list incorrectly labelled "Quickfix List" + 2068 7.2.118 at the more prompt only does half a page + 1550 7.2.119 status line is redrawn too often + 8305 7.2.120 location list is copied and then deleted when opening window + 4993 7.2.121 can't stop output of "!grep a *.c" in gvim with CTRL-C + 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 diff --git a/vim.spec b/vim.spec index 61cc400..db0aa6e 100644 --- a/vim.spec +++ b/vim.spec @@ -18,7 +18,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim72%{?beta} -%define patchlevel 088 +%define patchlevel 124 Summary: The VIM editor URL: http://www.vim.org/ @@ -154,6 +154,42 @@ 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 Patch3000: vim-7.0-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -375,6 +411,42 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch086 -p0 %patch087 -p0 %patch088 -p0 +%patch089 -p0 +%patch090 -p0 +%patch091 -p0 +%patch092 -p0 +%patch093 -p0 +%patch094 -p0 +%patch095 -p0 +%patch096 -p0 +%patch097 -p0 +%patch098 -p0 +%patch099 -p0 +%patch100 -p0 +%patch101 -p0 +%patch102 -p0 +%patch103 -p0 +%patch104 -p0 +%patch105 -p0 +%patch106 -p0 +%patch107 -p0 +%patch108 -p0 +%patch109 -p0 +%patch110 -p0 +%patch111 -p0 +%patch112 -p0 +%patch113 -p0 +%patch114 -p0 +%patch115 -p0 +%patch116 -p0 +%patch117 -p0 +%patch118 -p0 +%patch119 -p0 +%patch120 -p0 +%patch121 -p0 +%patch122 -p0 +%patch123 -p0 +%patch124 -p0 # install spell files %if %{withvimspell} @@ -833,6 +905,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Feb 23 2009 Karsten Hopp 7.2.124-1 +- patchlevel 124 + * Mon Jan 26 2009 Karsten Hopp 7.2.088-1 - patchlevel 88