r1201 - in /trunk/packages/vim: debian/changelog debian/tiny/vimrc.tiny.diff patches/commandline-compatible.diff patches/series

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sun Feb 10 00:24:36 UTC 2008


Author: jamessan
Date: Sun Feb 10 00:24:36 2008
New Revision: 1201

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1201
Log:
  - commandline-compatible.diff:
    + If either -N/-C options are given on the command line, set
      'nocompatible'/'compatible' after sourcing of the startup files
      finishes.  (Closes: #438560)
* Refreshed patches:
  - vimrc.tiny.diff

Added:
    trunk/packages/vim/patches/commandline-compatible.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/tiny/vimrc.tiny.diff
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1201&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun Feb 10 00:24:36 2008
@@ -13,6 +13,12 @@
       + Improves parsing of 'langmap' to follow the behavior specified in the
         help.  Commas need to be escaped if they're being used literally
         instead of as a list separator.  (Closes: #233008)
+    - commandline-compatible.diff:
+      + If either -N/-C options are given on the command line, set
+        'nocompatible'/'compatible' after sourcing of the startup files
+        finishes.  (Closes: #438560)
+  * Refreshed patches:
+    - vimrc.tiny.diff
   * Register the justify and editexisting plugins for use with
     vim-addons-manager.
     - justify.vim right and left aligns text by inserting extra spaces into

Modified: trunk/packages/vim/debian/tiny/vimrc.tiny.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/tiny/vimrc.tiny.diff?rev=1201&op=diff
==============================================================================
--- trunk/packages/vim/debian/tiny/vimrc.tiny.diff (original)
+++ trunk/packages/vim/debian/tiny/vimrc.tiny.diff Sun Feb 10 00:24:36 2008
@@ -16,17 +16,17 @@
 ===================================================================
 --- vim/src/main.c.orig
 +++ vim/src/main.c
-@@ -89,6 +89,9 @@
- #ifdef FEAT_DIFF
+@@ -93,6 +93,9 @@
      int		diff_mode;		/* start with 'diff' set */
  #endif
+     int		option_cp;		/* 0, SET_CP, SET_NOCP */
 +#ifdef SYS_TINYRC_FILE
 +    int		vi_mode;		/* started as "vi" */
 +#endif
  } mparm_T;
  
  /* Values for edit_type. */
-@@ -1470,6 +1473,8 @@
+@@ -1481,6 +1484,8 @@
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
@@ -35,7 +35,7 @@
  
      /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
      if (STRICMP(initstr, "diff") == 0)
-@@ -2737,7 +2742,14 @@
+@@ -2750,7 +2755,14 @@
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE

Added: trunk/packages/vim/patches/commandline-compatible.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/commandline-compatible.diff?rev=1201&op=file
==============================================================================
--- trunk/packages/vim/patches/commandline-compatible.diff (added)
+++ trunk/packages/vim/patches/commandline-compatible.diff Sun Feb 10 00:24:36 2008
@@ -1,0 +1,54 @@
+Index: vim/src/main.c
+===================================================================
+--- vim/src/main.c.orig
++++ vim/src/main.c
+@@ -37,6 +37,9 @@
+ #define	WIN_VER	    2	    /* "-O" vertically split windows */
+ #define	WIN_TABS    3	    /* "-p" windows on tab pages */
+ 
++#define SET_CP   1  /* "-C" set compatible */
++#define SET_NOCP 2  /* "-N" set nocompatible */
++
+ /* Struct for various parameters passed between main() and other functions. */
+ typedef struct
+ {
+@@ -89,6 +92,7 @@
+ #ifdef FEAT_DIFF
+     int		diff_mode;		/* start with 'diff' set */
+ #endif
++    int		option_cp;		/* 0, SET_CP, SET_NOCP */
+ } mparm_T;
+ 
+ /* Values for edit_type. */
+@@ -641,6 +645,13 @@
+     }
+ #endif
+ 
++    /* -N/-C given on the command-line.  Now that the startup files are done
++     * being sourced, we set the option. */
++    if (params.option_cp == SET_CP)
++	change_compatible(TRUE);
++    else if (params.option_cp == SET_NOCP)
++	change_compatible(FALSE);
++
+ #ifdef SPAWNO		/* special MSDOS swapping library */
+     init_SPAWNO("", SWAP_ANY);
+ #endif
+@@ -1751,7 +1762,7 @@
+ 		break;
+ 
+ 	    case 'C':		/* "-C"  Compatible */
+-		change_compatible(TRUE);
++		parmp->option_cp = SET_CP;
+ 		break;
+ 
+ 	    case 'e':		/* "-e" Ex mode */
+@@ -1824,7 +1835,7 @@
+ 		break;
+ 
+ 	    case 'N':		/* "-N"  Nocompatible */
+-		change_compatible(FALSE);
++		parmp->option_cp = SET_NOCP;
+ 		break;
+ 
+ 	    case 'n':		/* "-n" no swap file */

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1201&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sun Feb 10 00:24:36 2008
@@ -1,3 +1,4 @@
+commandline-compatible.diff -p0
 xdefaults.vim.diff -p0
 po.vim.diff -p0
 python.vim-ftplugin_include.diff -p0




More information about the pkg-vim-maintainers mailing list