[SCM] Vim packaging branch, maint/lenny, updated. debian/7.1.314-3-51-g209709e
James Vega
jamessan at debian.org
Sun Oct 12 06:29:21 UTC 2008
The following commit has been merged in the maint/lenny branch:
commit 5803aa663e3d75bc0d42a29fda41d0de61163432
Author: James Vega <jamessan at debian.org>
Date: Wed Aug 13 20:20:10 2008 -0400
Revert "Merge branch 'deb/set-cp-after-init'"
After further discussion with Bram, he decided that the behavior
set-cp-after-init was changing was behaving exactly as intended.
Ref. #438560
This reverts commit 1ce7365a7ad08f3cb9ba5ba4e42f8b5d1ae331f8.
Conflicts:
src/main.c
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/src/main.c b/src/main.c
index e5c343d..2e7bcb2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,9 +37,6 @@
#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
{
@@ -92,7 +89,6 @@ typedef struct
#ifdef FEAT_DIFF
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
@@ -648,13 +644,6 @@ main
}
#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
@@ -1769,7 +1758,7 @@ command_line_scan(parmp)
break;
case 'C': /* "-C" Compatible */
- parmp->option_cp = SET_CP;
+ change_compatible(TRUE);
break;
case 'e': /* "-e" Ex mode */
@@ -1842,7 +1831,7 @@ command_line_scan(parmp)
break;
case 'N': /* "-N" Nocompatible */
- parmp->option_cp = SET_NOCP;
+ change_compatible(FALSE);
break;
case 'n': /* "-n" no swap file */
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list