r176 - in trunk/vim/debian: . patches

[Stefano Zacchiroli]

Author: zack
Date: 2005-04-19 07:34:11 +0000 (Tue, 19 Apr 2005)
New Revision: 176

Added:
   trunk/vim/debian/patches/401_doc_exrc.diff
Removed:
   trunk/vim/debian/patches/303__exrc.c.diff
Modified:
   trunk/vim/debian/changelog
Log:
as suggested by Bram, fixes documentation on "_exrc" instead of changing its (intended) behaviour


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-04-18 04:42:35 UTC (rev 175)
+++ trunk/vim/debian/changelog	2005-04-19 07:34:11 UTC (rev 176)
@@ -9,8 +9,8 @@
 
   * Stefano Zacchiroli <zack@debian.org>:
     + Updated patch 118_ocaml.vim.diff (new upstream).
-    + Added patch 303__exrc.c.diff, which makes vim look for _exrc when
-      'exrc' is set. (closes: #279378)
+    + Added patch 401_doc_exrc.diff, which fixes starting doc wrt "_exrc"
+      (closes: #279378)
 
   * Matthijs Mohlmann <matthijs@cacholong.nl>:
     + Fixes menu entry with icon (wrong syntax used in menu file), thanks to

Deleted: trunk/vim/debian/patches/303__exrc.c.diff
===================================================================
--- trunk/vim/debian/patches/303__exrc.c.diff	2005-04-18 04:42:35 UTC (rev 175)
+++ trunk/vim/debian/patches/303__exrc.c.diff	2005-04-19 07:34:11 UTC (rev 176)
@@ -1,12 +0,0 @@
-diff -urN vim63/src/main.c vim63.new/src/main.c
---- vim63/src/main.c	2005-04-18 00:26:22.292076624 +0200
-+++ vim63.new/src/main.c	2005-04-18 00:26:00.650366664 +0200
-@@ -1445,7 +1445,7 @@
- 				      (char_u *)EXRC_FILE, FALSE) != FPC_SAME
- #endif
- 				)
--		    (void)do_source((char_u *)EXRC_FILE, FALSE, FALSE);
-+		    (void)do_source((char_u *)EXRC_FILE, TRUE, FALSE);
- 	    }
- 	}
- 	if (secure == 2)

Added: trunk/vim/debian/patches/401_doc_exrc.diff
===================================================================
--- trunk/vim/debian/patches/401_doc_exrc.diff	2005-04-18 04:42:35 UTC (rev 175)
+++ trunk/vim/debian/patches/401_doc_exrc.diff	2005-04-19 07:34:11 UTC (rev 176)
@@ -0,0 +1,13 @@
+diff -urN vim63/runtime/doc/starting.txt vim63.new/runtime/doc/starting.txt
+--- vim63/runtime/doc/starting.txt	2004-06-07 11:05:20.000000000 +0200
++++ vim63.new/runtime/doc/starting.txt	2005-04-19 09:28:33.000000000 +0200
+@@ -768,8 +768,7 @@
+ 		    ".vimrc" (for MS-DOS and Win32) (*)
+ 	-  The file ".exrc"  (for Unix, Amiga and OS/2)
+ 		    "_exrc"  (for MS-DOS and Win32)
+-	-  The file "_exrc"  (for Unix, Amiga and OS/2)
+-		    ".exrc"  (for MS-DOS and Win32)
++	-  The file ".exrc"  (for MS-DOS and Win32)
+ 
+      (*) Using this file or environment variable will cause 'compatible' to be
+ 	 off by default.  See |compatible-default|.