|
 |
e9cbc86 |
To: vim_dev@googlegroups.com
|
|
|
e9cbc86 |
Subject: Patch 7.3.193
|
|
|
e9cbc86 |
Fcc: outbox
|
|
|
e9cbc86 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
e9cbc86 |
Mime-Version: 1.0
|
|
|
e9cbc86 |
Content-Type: text/plain; charset=UTF-8
|
|
|
e9cbc86 |
Content-Transfer-Encoding: 8bit
|
|
|
e9cbc86 |
------------
|
|
|
e9cbc86 |
|
|
|
e9cbc86 |
Patch 7.3.193
|
|
|
e9cbc86 |
Problem: In the command line window ":close" doesn't work properly. (Tony
|
|
|
e9cbc86 |
Mechelynck)
|
|
|
e9cbc86 |
Solution: Use Ctrl_C instead of K_IGNORE for cmdwin_result. (Jean-Rene
|
|
|
e9cbc86 |
David)
|
|
|
e9cbc86 |
Files: src/ex_docmd.c, src/ex_getln.c
|
|
|
e9cbc86 |
|
|
|
e9cbc86 |
|
|
|
e9cbc86 |
*** ../vim-7.3.192/src/ex_docmd.c 2011-05-10 16:41:13.000000000 +0200
|
|
|
e9cbc86 |
--- src/ex_docmd.c 2011-05-19 14:42:56.000000000 +0200
|
|
|
e9cbc86 |
***************
|
|
|
e9cbc86 |
*** 6472,6478 ****
|
|
|
e9cbc86 |
{
|
|
|
e9cbc86 |
# ifdef FEAT_CMDWIN
|
|
|
e9cbc86 |
if (cmdwin_type != 0)
|
|
|
e9cbc86 |
! cmdwin_result = K_IGNORE;
|
|
|
e9cbc86 |
else
|
|
|
e9cbc86 |
# endif
|
|
|
e9cbc86 |
if (!text_locked()
|
|
|
e9cbc86 |
--- 6472,6478 ----
|
|
|
e9cbc86 |
{
|
|
|
e9cbc86 |
# ifdef FEAT_CMDWIN
|
|
|
e9cbc86 |
if (cmdwin_type != 0)
|
|
|
e9cbc86 |
! cmdwin_result = Ctrl_C;
|
|
|
e9cbc86 |
else
|
|
|
e9cbc86 |
# endif
|
|
|
e9cbc86 |
if (!text_locked()
|
|
|
e9cbc86 |
*** ../vim-7.3.192/src/ex_getln.c 2011-04-28 17:21:49.000000000 +0200
|
|
|
e9cbc86 |
--- src/ex_getln.c 2011-05-19 14:42:56.000000000 +0200
|
|
|
e9cbc86 |
***************
|
|
|
e9cbc86 |
*** 6324,6329 ****
|
|
|
e9cbc86 |
--- 6324,6335 ----
|
|
|
e9cbc86 |
ccline.cmdbuff = vim_strsave((char_u *)"qa");
|
|
|
e9cbc86 |
cmdwin_result = CAR;
|
|
|
e9cbc86 |
}
|
|
|
e9cbc86 |
+ else if (cmdwin_result == Ctrl_C)
|
|
|
e9cbc86 |
+ {
|
|
|
e9cbc86 |
+ /* :q or :close, don't execute any command
|
|
|
e9cbc86 |
+ * and don't modify the cmd window. */
|
|
|
e9cbc86 |
+ ccline.cmdbuff = NULL;
|
|
|
e9cbc86 |
+ }
|
|
|
e9cbc86 |
else
|
|
|
e9cbc86 |
ccline.cmdbuff = vim_strsave(ml_get_curline());
|
|
|
e9cbc86 |
if (ccline.cmdbuff == NULL)
|
|
|
e9cbc86 |
*** ../vim-7.3.192/src/version.c 2011-05-19 14:30:07.000000000 +0200
|
|
|
e9cbc86 |
--- src/version.c 2011-05-19 14:48:12.000000000 +0200
|
|
|
e9cbc86 |
***************
|
|
|
e9cbc86 |
*** 711,712 ****
|
|
|
e9cbc86 |
--- 711,714 ----
|
|
|
e9cbc86 |
{ /* Add new patch number below this line */
|
|
|
e9cbc86 |
+ /**/
|
|
|
e9cbc86 |
+ 193,
|
|
|
e9cbc86 |
/**/
|
|
|
e9cbc86 |
|
|
|
e9cbc86 |
--
|
|
|
e9cbc86 |
There's no place like $(HOME)!
|
|
|
e9cbc86 |
|
|
|
e9cbc86 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
e9cbc86 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
e9cbc86 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
e9cbc86 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|