Patch 7.3.776 breaks keyword matching (\k \< \>) on other window.
Steps to reproduce:
$ vim -u NONE
:syntax on
:call setline(1, 'foo')
:syntax match Keyword /\k\+/
:new
:setlocal iskeyword=
:redraw!
Now, "foo" is not highlighted.
Please check the following patch.
diff -r 274c841f033a src/mbyte.c
--- a/src/mbyte.c Fri Jan 25 20:11:01 2013 +0100
+++ b/src/mbyte.c Mon Jan 28 10:51:01 2013 +0900
@@ -869,11 +869,19 @@
mb_get_class(p)
char_u *p;
{
+ return mb_get_class_buf(p, curbuf);
+}
+
+ int
+mb_get_class_buf(p, buf)
+ char_u *p;
+ buf_T *buf;
+{
if (MB_BYTE2LEN(p[0]) == 1)
{
if (p[0] == NUL || vim_iswhite(p[0]))
return 0;
- if (vim_iswordc(p[0]))
+ if (vim_iswordc_buf(p[0], buf))
return 2;
return 1;
}
diff -r 274c841f033a src/proto/mbyte.pro
--- a/src/proto/mbyte.pro Fri Jan 25 20:11:01 2013 +0100
+++ b/src/proto/mbyte.pro Mon Jan 28 10:51:01 2013 +0900
@@ -4,6 +4,7 @@
int bomb_size __ARGS((void));
void remove_bom __ARGS((char_u *s));
int mb_get_class __ARGS((char_u *p));
+int mb_get_class_buf __ARGS((char_u *p, buf_T *buf));
int dbcs_class __ARGS((unsigned lead, unsigned trail));
int latin_char2len __ARGS((int c));
int latin_char2bytes __ARGS((int c, char_u *buf));
diff -r 274c841f033a src/regexp.c
--- a/src/regexp.c Fri Jan 25 20:11:01 2013 +0100
+++ b/src/regexp.c Mon Jan 28 10:51:01 2013 +0900
@@ -4013,8 +4013,8 @@
reg_prev_class()
{
if (reginput > regline)
- return mb_get_class(reginput - 1
- - (*mb_head_off)(regline, reginput - 1));
+ return mb_get_class_buf(reginput - 1
+ - (*mb_head_off)(regline, reginput - 1), reg_buf);
return -1;
}
@@ -4304,7 +4304,7 @@
int this_class;
/* Get class of current and previous char (if it exists). */
- this_class = mb_get_class(reginput);
+ this_class = mb_get_class_buf(reginput, reg_buf);
if (this_class <= 1)
status = RA_NOMATCH; /* not on a word at all */
else if (reg_prev_class() == this_class)
@@ -4328,7 +4328,7 @@
int this_class, prev_class;
/* Get class of current and previous char (if it exists). */
- this_class = mb_get_class(reginput);
+ this_class = mb_get_class_buf(reginput, reg_buf);
prev_class = reg_prev_class();
if (this_class == prev_class
|| prev_class == 0 || prev_class == 1)
@@ -4365,14 +4365,14 @@
break;
case KWORD:
- if (!vim_iswordp(reginput))
+ if (!vim_iswordp_buf(reginput, reg_buf))
status = RA_NOMATCH;
else
ADVANCE_REGINPUT();
break;
case SKWORD:
- if (VIM_ISDIGIT(*reginput) || !vim_iswordp(reginput))
+ if (VIM_ISDIGIT(*reginput) || !vim_iswordp_buf(reginput, reg_buf))
status = RA_NOMATCH;
else
ADVANCE_REGINPUT();
@@ -5734,7 +5734,7 @@
case SKWORD + ADD_NL:
while (count < maxcount)
{
- if (vim_iswordp(scan) && (testval || !VIM_ISDIGIT(*scan)))
+ if (vim_iswordp_buf(scan, reg_buf) && (testval ||
!VIM_ISDIGIT(*scan)))
{
mb_ptr_adv(scan);
}
--
Yukihiro Nakadaira - [email protected]
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
