diff options
Diffstat (limited to '')
| -rw-r--r-- | source/ap/vim/patches/7.3.057 (renamed from source/ap/vim/patches/7.2.172) | 69 |
1 files changed, 36 insertions, 33 deletions
diff --git a/source/ap/vim/patches/7.2.172 b/source/ap/vim/patches/7.3.057 index 1ba814d32..d4ea2bc04 100644 --- a/source/ap/vim/patches/7.2.172 +++ b/source/ap/vim/patches/7.3.057 @@ -1,5 +1,5 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.172 (extra) +To: vim_dev@googlegroups.com +Subject: Patch 7.3.057 Fcc: outbox From: Bram Moolenaar <Bram@moolenaar.net> Mime-Version: 1.0 @@ -7,41 +7,44 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ -Patch 7.2.172 (extra) -Problem: Compiler warning. -Solution: Adjust function prototype. (Patrick Texier) -Files: src/os_mswin.c +Patch 7.3.057 +Problem: Segfault with command line abbreviation. (Randy Morris) +Solution: Don't retrigger the abbreviation when abandoning the command line. + Continue editing the command line after the error. +Files: src/ex_getln.c + - -*** ../vim-7.2.171/src/os_mswin.c 2009-01-22 21:49:21.000000000 +0100 ---- src/os_mswin.c 2009-05-14 20:54:32.000000000 +0200 +*** ../vim-7.3.056/src/ex_getln.c 2010-11-10 15:37:00.000000000 +0100 +--- src/ex_getln.c 2010-11-16 14:03:09.000000000 +0100 *************** -*** 1227,1234 **** - * Wait for another process to Close the Clipboard. - * Returns TRUE for success. - */ -! int -! vim_open_clipboard() - { - int delay = 10; - ---- 1227,1234 ---- - * Wait for another process to Close the Clipboard. - * Returns TRUE for success. - */ -! static int -! vim_open_clipboard(void) - { - int delay = 10; - -*** ../vim-7.2.171/src/version.c 2009-05-14 21:51:06.000000000 +0200 ---- src/version.c 2009-05-14 21:59:45.000000000 +0200 +*** 712,718 **** + } + } + beep_flush(); +! c = ESC; + } + #endif + else +--- 712,722 ---- + } + } + beep_flush(); +! got_int = FALSE; /* don't abandon the command line */ +! did_emsg = FALSE; +! emsg_on_display = FALSE; +! redrawcmd(); +! goto cmdline_not_changed; + } + #endif + else +*** ../vim-7.3.056/src/version.c 2010-11-16 11:29:30.000000000 +0100 +--- src/version.c 2010-11-16 14:04:25.000000000 +0100 *************** -*** 678,679 **** ---- 678,681 ---- +*** 716,717 **** +--- 716,719 ---- { /* Add new patch number below this line */ + /**/ -+ 172, ++ 57, /**/ -- @@ -55,5 +58,5 @@ FROG: How you English say: I one more time, mac, I unclog my nose towards /// 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 /// +\\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |