To: vim_dev@googlegroups.com
Subject: Patch 7.4b.017
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4b.017
Problem:    ":he \^x" gives a strange error message. (glts)
Solution:   Do not translate \^x to \_CTRL-x.
Files:	    src/ex_cmds.c


*** ../vim-7.4b.016/src/ex_cmds.c	2013-08-03 13:41:12.000000000 +0200
--- src/ex_cmds.c	2013-08-07 15:15:51.000000000 +0200
***************
*** 6019,6026 ****
  	    if (*s < ' ' || (*s == '^' && s[1] && (ASCII_ISALPHA(s[1])
  			   || vim_strchr((char_u *)"?@[\\]^", s[1]) != NULL)))
  	    {
! 		if (d > IObuff && d[-1] != '_')
! 		    *d++ = '_';		/* prepend a '_' */
  		STRCPY(d, "CTRL-");
  		d += 5;
  		if (*s < ' ')
--- 6019,6026 ----
  	    if (*s < ' ' || (*s == '^' && s[1] && (ASCII_ISALPHA(s[1])
  			   || vim_strchr((char_u *)"?@[\\]^", s[1]) != NULL)))
  	    {
! 		if (d > IObuff && d[-1] != '_' && d[-1] != '\\')
! 		    *d++ = '_';		/* prepend a '_' to make x_CTRL-x */
  		STRCPY(d, "CTRL-");
  		d += 5;
  		if (*s < ' ')
*** ../vim-7.4b.016/src/version.c	2013-08-07 15:22:19.000000000 +0200
--- src/version.c	2013-08-07 15:23:24.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     17,
  /**/

-- 
Be thankful to be in a traffic jam, because it means you own a car.

 /// 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    ///