[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.2.130-111-gf9cf686
James Vega
jamessan at debian.org
Wed Jun 17 04:20:57 UTC 2009
The following commit has been merged in the deb/langmap-escaped-comma branch:
commit f9cf686a86bef4405d59493642b1b5b902fc0c69
Merge: e968188c2a7589313f44b7bf59c5a5109667055e cc9c175aa23241e7578358fc7cdcf2537c909b2b
Author: James Vega <jamessan at debian.org>
Date: Tue Jun 16 18:54:09 2009 -0400
Merge branch 'upstream' into deb/langmap-escaped-comma
diff --combined src/option.c
index 6bc372a,6eb7903..21328eb
--- a/src/option.c
+++ b/src/option.c
@@@ -4006,7 -4006,7 +4006,7 @@@ do_set(arg, opt_flags
else
{
prefix = 1;
- if (STRNCMP(arg, "no", 2) == 0)
+ if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
{
prefix = 0;
arg += 2;
@@@ -7024,6 -7024,7 +7024,7 @@@ check_clipboard_option(
int new_unnamed = FALSE;
int new_autoselect = FALSE;
int new_autoselectml = FALSE;
+ int new_html = FALSE;
regprog_T *new_exclude_prog = NULL;
char_u *errmsg = NULL;
char_u *p;
@@@ -7047,6 -7048,11 +7048,11 @@@
new_autoselectml = TRUE;
p += 12;
}
+ else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL))
+ {
+ new_html = TRUE;
+ p += 4;
+ }
else if (STRNCMP(p, "exclude:", 8) == 0 && new_exclude_prog == NULL)
{
p += 8;
@@@ -7068,6 -7074,7 +7074,7 @@@
clip_unnamed = new_unnamed;
clip_autoselect = new_autoselect;
clip_autoselectml = new_autoselectml;
+ clip_html = new_html;
vim_free(clip_exclude_prog);
clip_exclude_prog = new_exclude_prog;
}
@@@ -9750,7 -9757,7 +9757,7 @@@ set_context_in_set_cmd(xp, arg, opt_fla
}
--p;
}
- if (STRNCMP(p, "no", 2) == 0)
+ if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
{
xp->xp_context = EXPAND_BOOL_SETTINGS;
p += 2;
@@@ -10314,7 -10321,7 +10321,7 @@@ langmap_set(
{
char_u *p;
char_u *p2;
- int from, to;
+ int from=NUL, to=NUL;
#ifdef FEAT_MBYTE
ga_clear(&langmap_mapga); /* clear the previous map first */
@@@ -10335,11 -10342,6 +10342,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
@@@ -10350,29 -10352,23 +10357,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