[SCM] Vim packaging branch, deb/langmap-escaped-comma, updated. upstream/7.2.010-36-g6c4eb01
James Vega
jamessan at debian.org
Thu Oct 2 23:55:42 UTC 2008
The following commit has been merged in the deb/langmap-escaped-comma branch:
commit 6c4eb01c92d4aec7e795318b5917458e6c5ae3ff
Merge: da0b259577a39927550ae3a770b6f27f0461c480 a8a83beb9476a5d66a5c7a4590ab8df93b500dae
Author: James Vega <jamessan at debian.org>
Date: Thu Oct 2 19:47:52 2008 -0400
Merge branch 'upstream' into deb/langmap-escaped-comma
diff --combined src/option.c
index b1b3405,20fef41..da542e0
--- a/src/option.c
+++ b/src/option.c
@@@ -7974,6 -7974,11 +7974,11 @@@ set_num_option(opt_idx, varp, value, er
else /* curwin->w_p_scr > curwin->w_height */
curwin->w_p_scr = curwin->w_height;
}
+ if (p_hi < 0)
+ {
+ errmsg = e_positive;
+ p_hi = 0;
+ }
if (p_report < 0)
{
errmsg = e_positive;
@@@ -10123,7 -10128,7 +10128,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 */
@@@ -10141,11 -10146,6 +10146,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
@@@ -10156,29 -10156,23 +10161,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