[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.2.130-164-g34071d1
James Vega
jamessan at debian.org
Mon Sep 14 03:13:18 UTC 2009
The following commit has been merged in the deb/langmap-escaped-comma branch:
commit 34071d19e74386d5f24bc38ece87e6ccd5d1f303
Merge: 6d356eeb9d883a947fd646adfe310efaa3e5eed0 26951cd09c2f9918e438a79c9c7c4b856f5c0689
Author: James Vega <jamessan at debian.org>
Date: Fri Sep 11 14:48:22 2009 -0400
Merge branch 'upstream' into deb/langmap-escaped-comma
diff --combined src/option.c
index fca1d86,d680cfb..cdd7d06
--- a/src/option.c
+++ b/src/option.c
@@@ -7430,6 -7430,8 +7430,8 @@@ set_bool_option(opt_idx, varp, value, o
{
if (curwin->w_p_wrap)
curwin->w_leftcol = 0;
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
}
#ifdef FEAT_WINDOWS
@@@ -7662,6 -7664,22 +7664,22 @@@
if (curwin->w_curswant != MAXCOL)
curwin->w_set_curswant = TRUE;
}
+ #endif
+
+ #ifdef FEAT_LINEBREAK
+ if ((int *)varp == &curwin->w_p_lbr)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
+ #endif
+
+ #ifdef FEAT_RIGHTLEFT
+ if ((int *)varp == &curwin->w_p_rl)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
#endif
/*
@@@ -10359,7 -10377,7 +10377,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 */
@@@ -10380,11 -10398,6 +10398,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
@@@ -10395,29 -10408,23 +10413,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