Karsten Hopp 343604
To: vim_dev@googlegroups.com
Karsten Hopp 343604
Subject: Patch 7.4.516
Karsten Hopp 343604
Fcc: outbox
Karsten Hopp 343604
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 343604
Mime-Version: 1.0
Karsten Hopp 343604
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 343604
Content-Transfer-Encoding: 8bit
Karsten Hopp 343604
------------
Karsten Hopp 343604
Karsten Hopp 343604
Patch 7.4.516
Karsten Hopp 343604
Problem:    Completing a function name containing a # does not work.  Issue
Karsten Hopp 343604
	    253.
Karsten Hopp 343604
Solution:   Recognize the # character. (Christian Brabandt)
Karsten Hopp 343604
Files:	    src/eval.c
Karsten Hopp 343604
Karsten Hopp 343604
Karsten Hopp 343604
*** ../vim-7.4.515/src/eval.c	2014-11-12 18:49:12.992752234 +0100
Karsten Hopp 343604
--- src/eval.c	2014-11-12 20:05:35.609826215 +0100
Karsten Hopp 343604
***************
Karsten Hopp 343604
*** 3368,3378 ****
Karsten Hopp 343604
  	    got_eq = TRUE;
Karsten Hopp 343604
  	    xp->xp_context = EXPAND_EXPRESSION;
Karsten Hopp 343604
  	}
Karsten Hopp 343604
! 	else if (c == '<'
Karsten Hopp 343604
  		&& xp->xp_context == EXPAND_FUNCTIONS
Karsten Hopp 343604
  		&& vim_strchr(xp->xp_pattern, '(') == NULL)
Karsten Hopp 343604
  	{
Karsten Hopp 343604
! 	    /* Function name can start with "<SNR>" */
Karsten Hopp 343604
  	    break;
Karsten Hopp 343604
  	}
Karsten Hopp 343604
  	else if (cmdidx != CMD_let || got_eq)
Karsten Hopp 343604
--- 3368,3378 ----
Karsten Hopp 343604
  	    got_eq = TRUE;
Karsten Hopp 343604
  	    xp->xp_context = EXPAND_EXPRESSION;
Karsten Hopp 343604
  	}
Karsten Hopp 343604
! 	else if ((c == '<' || c == '#')
Karsten Hopp 343604
  		&& xp->xp_context == EXPAND_FUNCTIONS
Karsten Hopp 343604
  		&& vim_strchr(xp->xp_pattern, '(') == NULL)
Karsten Hopp 343604
  	{
Karsten Hopp 343604
! 	    /* Function name can start with "<SNR>" and contain '#'. */
Karsten Hopp 343604
  	    break;
Karsten Hopp 343604
  	}
Karsten Hopp 343604
  	else if (cmdidx != CMD_let || got_eq)
Karsten Hopp 343604
*** ../vim-7.4.515/src/version.c	2014-11-12 19:28:12.682661756 +0100
Karsten Hopp 343604
--- src/version.c	2014-11-12 20:05:00.730212577 +0100
Karsten Hopp 343604
***************
Karsten Hopp 343604
*** 743,744 ****
Karsten Hopp 343604
--- 743,746 ----
Karsten Hopp 343604
  {   /* Add new patch number below this line */
Karsten Hopp 343604
+ /**/
Karsten Hopp 343604
+     516,
Karsten Hopp 343604
  /**/
Karsten Hopp 343604
Karsten Hopp 343604
-- 
Karsten Hopp 343604
The Law of VIM:
Karsten Hopp 343604
For each member b of the possible behaviour space B of program P, there exists
Karsten Hopp 343604
a finite time t before which at least one user u in the total user space U of
Karsten Hopp 343604
program P will request b becomes a member of the allowed behaviour space B'
Karsten Hopp 343604
(B' <= B).
Karsten Hopp 343604
In other words: Sooner or later everyone wants everything as an option.
Karsten Hopp 343604
                                        -- Vince Negri
Karsten Hopp 343604
Karsten Hopp 343604
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 343604
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 343604
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 343604
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///