[SCM] Vim packaging branch, master-experimental, updated. debian/7.2b.001-1-62-g1c1c81b
James Vega
jamessan at debian.org
Sun Aug 10 01:35:05 UTC 2008
The following commit has been merged in the master-experimental branch:
commit aab03b979f9f5ef2f7a7d91a73e051290a2eb659
Merge: e2607cd4e0b86aaa6cb02f277c87c0247b62bea6 9b03294677c722b87dfc55704ff699a1fe7b49db
Author: James Vega <jamessan at debian.org>
Date: Thu Aug 7 11:36:58 2008 -0400
Merge branch 'deb/runtime' into master-experimental
Conflicts:
src/ui.c
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined src/Makefile
index 2c5c06a,7fe7690..9d47cf5
--- a/src/Makefile
+++ b/src/Makefile
@@@ -901,7 -901,7 +901,7 @@@ MAN1DIR = /man
### Vim version (adjusted by a script)
VIMMAJOR = 7
- VIMMINOR = 2b
+ VIMMINOR = 2c
### Location of Vim files (should not need to be changed, and {{{1
### some things might not work when they are changed!)
@@@ -1779,6 -1779,7 +1779,6 @@@ installvimbin: $(VIMTARGET) $(DESTDIR)$
rm -f $(DEST_BIN)/$(VIMNAME).rm; \
fi
$(INSTALL_PROG) $(VIMTARGET) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/$(VIMTARGET)
chmod $(BINMOD) $(DEST_BIN)/$(VIMTARGET)
# may create a link to the new executable from /usr/bin/vi
-$(LINKIT)
@@@ -1913,6 -1914,7 +1913,6 @@@ installtools: $(TOOLS) $(DESTDIR)$(exec
rm -f $(DEST_BIN)/xxd.rm; \
fi
$(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/xxd$(EXEEXT)
chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
-$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
diff --combined src/main.c
index 3070ac7,a9eb460..c2d4e39
--- a/src/main.c
+++ b/src/main.c
@@@ -35,9 -35,6 +35,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
{
@@@ -90,10 -87,6 +90,10 @@@
#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
} mparm_T;
/* Values for edit_type. */
@@@ -646,13 -639,6 +646,13 @@@ mai
}
#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
@@@ -1488,10 -1474,6 +1488,10 @@@ parse_command_name(parmp
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
+#ifdef SYS_TINYRC_FILE
+ else if (STRNICMP(initstr, "vi", 2) == 0)
+ parmp->vi_mode = TRUE;
+#endif
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
@@@ -1773,7 -1755,7 +1773,7 @@@ command_line_scan(parmp
break;
case 'C': /* "-C" Compatible */
- change_compatible(TRUE);
+ parmp->option_cp = SET_CP;
break;
case 'e': /* "-e" Ex mode */
@@@ -1846,7 -1828,7 +1846,7 @@@
break;
case 'N': /* "-N" Nocompatible */
- change_compatible(FALSE);
+ parmp->option_cp = SET_NOCP;
break;
case 'n': /* "-n" no swap file */
@@@ -2263,7 -2245,12 +2263,12 @@@ scripterror
/* Remember this argument has been added to the argument list.
* Needed when 'encoding' is changed. */
used_file_arg(argv[0], parmp->literal, parmp->full_path,
- parmp->diff_mode);
+ # ifdef FEAT_DIFF
+ parmp->diff_mode
+ # else
+ FALSE
+ # endif
+ );
}
#endif
}
@@@ -2542,7 -2529,6 +2547,6 @@@ edit_buffers(parmp
int arg_idx; /* index in argument list */
int i;
int advance = TRUE;
- buf_T *old_curbuf;
# ifdef FEAT_AUTOCMD
/*
@@@ -2595,21 -2581,26 +2599,26 @@@
curwin->w_arg_idx = arg_idx;
/* Edit file from arg list, if there is one. When "Quit" selected
* at the ATTENTION prompt close the window. */
- old_curbuf = curbuf;
+ # ifdef HAS_SWAP_EXISTS_ACTION
+ swap_exists_did_quit = FALSE;
+ # endif
(void)do_ecmd(0, arg_idx < GARGCOUNT
? alist_name(&GARGLIST[arg_idx]) : NULL,
NULL, NULL, ECMD_LASTL, ECMD_HIDE);
- if (curbuf == old_curbuf)
+ # ifdef HAS_SWAP_EXISTS_ACTION
+ if (swap_exists_did_quit)
{
+ /* abort or quit selected */
if (got_int || only_one_window())
{
- /* abort selected or quit and only one window */
+ /* abort selected and only one window */
did_emsg = FALSE; /* avoid hit-enter prompt */
getout(1);
}
win_close(curwin, TRUE);
advance = FALSE;
}
+ # endif
if (arg_idx == GARGCOUNT - 1)
arg_had_last = TRUE;
++arg_idx;
@@@ -2765,12 -2756,7 +2774,12 @@@ source_startup_scripts(parmp
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
- (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
+# if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
+ if (parmp->vi_mode)
+ (void)do_source((char_u *)SYS_TINYRC_FILE, FALSE, DOSO_NONE);
+ else
+# endif
+ (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
diff --combined src/option.c
index 6684113,04581a8..b1b3405
--- a/src/option.c
+++ b/src/option.c
@@@ -8622,8 -8622,9 +8622,9 @@@ makeset(fd, opt_flags, local_only
# endif
# endif
# if defined(FEAT_AUTOCMD)
- p->indir == PV_FT)
+ p->indir == PV_FT
# endif
+ )
{
if (fprintf(fd, "if &%s != '%s'", p->fullname,
*(char_u **)(varp)) < 0
@@@ -10122,7 -10123,7 +10123,7 @@@ langmap_set(
{
char_u *p;
char_u *p2;
- int from, to;
+ int from=NUL, to=NUL;
langmap_init(); /* back to one-to-one map first */
@@@ -10140,11 -10141,6 +10141,11 @@@
p2 = NULL; /* aAbBcCdD form, p2 is NULL */
while (p[0])
{
+ if (p[0] == ',')
+ {
+ ++p;
+ break;
+ }
if (p[0] == '\\' && p[1] != NUL)
++p;
#ifdef FEAT_MBYTE
@@@ -10155,29 -10151,23 +10156,29 @@@
if (p2 == NULL)
{
mb_ptr_adv(p);
- if (p[0] == '\\')
- ++p;
+ if (p[0] != ',')
+ {
+ if (p[0] == '\\')
+ ++p;
#ifdef FEAT_MBYTE
- to = (*mb_ptr2char)(p);
+ to = (*mb_ptr2char)(p);
#else
- to = p[0];
+ to = p[0];
#endif
+ }
}
else
{
- if (p2[0] == '\\')
- ++p2;
+ if (p2[0] != ',')
+ {
+ if (p2[0] == '\\')
+ ++p2;
#ifdef FEAT_MBYTE
- to = (*mb_ptr2char)(p2);
+ to = (*mb_ptr2char)(p2);
#else
- to = p2[0];
+ to = p2[0];
#endif
+ }
}
if (to == NUL)
{
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list