diff --git a/7.3.944 b/7.3.944 new file mode 100644 index 0000000..f5bbc97 --- /dev/null +++ b/7.3.944 @@ -0,0 +1,69 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.3.944 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.3.944 +Problem: External program receives the termrespone. +Solution: Insert a delay and discard input. (Hayaki Saito) +Files: src/term.c + + +*** ../vim-7.3.943/src/term.c 2013-04-06 14:30:35.000000000 +0200 +--- src/term.c 2013-05-13 20:24:14.000000000 +0200 +*************** +*** 3253,3261 **** + if (!gui.in_use && !gui.starting) + # endif + { +! /* May need to check for T_CRV response. */ + if (crv_status == CRV_SENT || u7_status == U7_SENT) +! (void)vpeekc_nomap(); + /* Check for termcodes first, otherwise an external program may + * get them. */ + check_for_codes_from_term(); +--- 3253,3271 ---- + if (!gui.in_use && !gui.starting) + # endif + { +! /* May need to discard T_CRV or T_U7 response. */ + if (crv_status == CRV_SENT || u7_status == U7_SENT) +! { +! # ifdef UNIX +! /* Give the terminal a chance to respond. */ +! mch_delay(100L, FALSE); +! # endif +! # ifdef TCIFLUSH +! /* Discard data received but not read. */ +! if (exiting) +! tcflush(fileno(stdin), TCIFLUSH); +! # endif +! } + /* Check for termcodes first, otherwise an external program may + * get them. */ + check_for_codes_from_term(); +*** ../vim-7.3.943/src/version.c 2013-05-12 21:16:17.000000000 +0200 +--- src/version.c 2013-05-13 20:24:29.000000000 +0200 +*************** +*** 730,731 **** +--- 730,733 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 944, + /**/ + +-- +DENNIS: Listen -- strange women lying in ponds distributing swords is no + basis for a system of government. Supreme executive power derives + from a mandate from the masses, not from some farcical aquatic + ceremony. + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/README.patches b/README.patches index e7e5ab7..ad55b60 100644 --- a/README.patches +++ b/README.patches @@ -975,3 +975,4 @@ Individual patches for Vim 7.3: 32095 7.3.941 Python: Stuff in if_py_both.h is ordered badly 5470 7.3.942 Python: SEGV in Buffer functions 6867 7.3.943 Python: Negative indices were failing + 2283 7.3.944 external program receives the termrespone diff --git a/vim-update.sh b/vim-update.sh index 6ef30d8..9d87b8f 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -2,6 +2,7 @@ debug="" #debug="echo" +cd `dirname $0` LANG=C SPEC=vim.spec diff --git a/vim.spec b/vim.spec index 9aecdd9..d91f31d 100644 --- a/vim.spec +++ b/vim.spec @@ -18,13 +18,13 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim73%{?beta} -%define patchlevel 943 +%define patchlevel 944 Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -999,6 +999,7 @@ Patch940: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.940 Patch941: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.941 Patch942: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.942 Patch943: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.943 +Patch944: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.944 Patch3000: vim-7.3-syntax.patch Patch3002: vim-7.1-nowarnings.patch @@ -2089,6 +2090,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch941 -p0 %patch942 -p0 %patch943 -p0 +%patch944 -p0 # install spell files @@ -2566,6 +2568,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue May 14 2013 Karsten Hopp 7.3.944-1 +- patchlevel 944 + * Mon May 13 2013 Karsten Hopp 7.3.943-2 - add BR perl(ExtUtils::ParseXS) - fix path to xsubpp script @@ -2601,6 +2606,12 @@ rm -rf $RPM_BUILD_ROOT * Tue Nov 20 2012 Karsten Hopp 7.3.715-1 - patchlevel 715 +* Mon Nov 12 2012 Karsten Hopp 7.3.712-1 +- patchlevel 712 + +* Mon Nov 12 2012 Karsten Hopp 7.3.682-2 +- fix vim.csh syntax + * Tue Oct 23 2012 Karsten Hopp 7.3.712-1 - patchlevel 712