- patchlevel 402

7.2.402

@@ -0,0 +1,91 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.402
+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.2.402
+Problem:    This gives a #705 error: let X = function('haslocaldir')
+	    let X = function('getcwd')
+Solution:   Don't give E705 when the name is found in the hashtab. (Sergey
+	    Khorev)
+Files:	    src/eval.c
+
+
+*** ../vim-7.2.401/src/eval.c	2010-03-10 13:43:22.000000000 +0100
+--- src/eval.c	2010-03-17 19:35:01.000000000 +0100
+***************
+*** 19103,19108 ****
+--- 19103,19116 ----
+      hashtab_T	*ht;
+      char_u	*p;
+  
++     ht = find_var_ht(name, &varname);
++     if (ht == NULL || *varname == NUL)
++     {
++ 	EMSG2(_(e_illvar), name);
++ 	return;
++     }
++     v = find_var_in_ht(ht, varname, TRUE);
++ 
+      if (tv->v_type == VAR_FUNC)
+      {
+  	if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
+***************
+*** 19112,19118 ****
+  	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
+  	    return;
+  	}
+! 	if (function_exists(name))
+  	{
+  	    EMSG2(_("E705: Variable name conflicts with existing function: %s"),
+  									name);
+--- 19120,19129 ----
+  	    EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name);
+  	    return;
+  	}
+! 	/* Don't allow hiding a function.  When "v" is not NULL we migth be
+! 	 * assigning another function to the same var, the type is checked
+! 	 * below. */
+! 	if (v == NULL && function_exists(name))
+  	{
+  	    EMSG2(_("E705: Variable name conflicts with existing function: %s"),
+  									name);
+***************
+*** 19120,19133 ****
+  	}
+      }
+  
+-     ht = find_var_ht(name, &varname);
+-     if (ht == NULL || *varname == NUL)
+-     {
+- 	EMSG2(_(e_illvar), name);
+- 	return;
+-     }
+- 
+-     v = find_var_in_ht(ht, varname, TRUE);
+      if (v != NULL)
+      {
+  	/* existing variable, need to clear the value */
+--- 19131,19136 ----
+*** ../vim-7.2.401/src/version.c	2010-03-17 19:13:19.000000000 +0100
+--- src/version.c	2010-03-17 19:36:09.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     402,
+  /**/
+
+-- 
+Michael: There is no such thing as a dump question.
+Bernard: Sure there is.  For example "what is a core dump?"
+
+ /// 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        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

README.patches

@@ -27,6 +27,7 @@ Collection of patches for Vim 7.2:
 108889  7.2.001-100.gz        patches 7.2.001 to 7.2.100, gzip'ed
 208102  7.2.101-200.gz        patches 7.2.101 to 7.2.200, gzip'ed
  82163  7.2.201-300.gz        patches 7.2.201 to 7.2.300, gzip'ed
+ 94475  7.2.301-400.gz        patches 7.2.301 to 7.2.400, gzip'ed
 
 Individual patches for Vim 7.2:
 
@@ -430,3 +431,6 @@ Individual patches for Vim 7.2:
   1722  7.2.397  redundant check for w_lines_valid
   4127  7.2.398  when moving windows the cursor ends up in the wrong line
   1784  7.2.399  (extra, after 7.2.388) cannot compile on MingW
+ 12865  7.2.400  (after 7.2.387) Ruby problems with init and empty string
+  1982  7.2.401  wildmode list doesn't highlight directory names with a space
+  2649  7.2.402  error 705 when re-using funcref variable

vim.spec

@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 399
+%define patchlevel 402
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -465,6 +465,9 @@ Patch396: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.396
 Patch397: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.397
 Patch398: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.398
 Patch399: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.399
+Patch400: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.400
+Patch401: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.401
+Patch402: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.402
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -1002,6 +1005,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch397 -p0
 %patch398 -p0
 %patch399 -p0
+%patch400 -p0
+%patch401 -p0
+%patch402 -p0
 
 
 # install spell files
@@ -1466,6 +1472,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Mar 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.402-1
+- patchlevel 402
+
 * Wed Mar 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.399-1
 - patchlevel 399