mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 7.4.844
Problem: When '#' is in 'isident' the is# comparator doesn't work. Solution: Don't use vim_isIDc(). (Yasuhiro Matsumoto)
This commit is contained in:
@@ -4431,7 +4431,8 @@ eval4(arg, rettv, evaluate)
|
|||||||
{
|
{
|
||||||
if (p[2] == 'n' && p[3] == 'o' && p[4] == 't')
|
if (p[2] == 'n' && p[3] == 'o' && p[4] == 't')
|
||||||
len = 5;
|
len = 5;
|
||||||
if (!vim_isIDc(p[len]))
|
i = p[len];
|
||||||
|
if (!isalnum(i) && i != '_')
|
||||||
{
|
{
|
||||||
type = len == 2 ? TYPE_EQUAL : TYPE_NEQUAL;
|
type = len == 2 ? TYPE_EQUAL : TYPE_NEQUAL;
|
||||||
type_is = TRUE;
|
type_is = TRUE;
|
||||||
|
@@ -45,6 +45,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
|
|||||||
test_charsearch.out \
|
test_charsearch.out \
|
||||||
test_close_count.out \
|
test_close_count.out \
|
||||||
test_command_count.out \
|
test_command_count.out \
|
||||||
|
test_comparators.out \
|
||||||
test_erasebackword.out \
|
test_erasebackword.out \
|
||||||
test_eval.out \
|
test_eval.out \
|
||||||
test_fixeol.out \
|
test_fixeol.out \
|
||||||
@@ -198,6 +199,7 @@ test_changelist.out: test_changelist.in
|
|||||||
test_charsearch.out: test_charsearch.in
|
test_charsearch.out: test_charsearch.in
|
||||||
test_close_count.out: test_close_count.in
|
test_close_count.out: test_close_count.in
|
||||||
test_command_count.out: test_command_count.in
|
test_command_count.out: test_command_count.in
|
||||||
|
test_comparators.out: test_comparators.in
|
||||||
test_erasebackword.out: test_erasebackword.in
|
test_erasebackword.out: test_erasebackword.in
|
||||||
test_eval.out: test_eval.in
|
test_eval.out: test_eval.in
|
||||||
test_increment.out: test_increment.in
|
test_increment.out: test_increment.in
|
||||||
|
@@ -44,6 +44,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
|
|||||||
test_charsearch.out \
|
test_charsearch.out \
|
||||||
test_close_count.out \
|
test_close_count.out \
|
||||||
test_command_count.out \
|
test_command_count.out \
|
||||||
|
test_comparators.out \
|
||||||
test_erasebackword.out \
|
test_erasebackword.out \
|
||||||
test_eval.out \
|
test_eval.out \
|
||||||
test_fixeol.out \
|
test_fixeol.out \
|
||||||
|
@@ -66,6 +66,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
|
|||||||
test_charsearch.out \
|
test_charsearch.out \
|
||||||
test_close_count.out \
|
test_close_count.out \
|
||||||
test_command_count.out \
|
test_command_count.out \
|
||||||
|
test_comparators.out \
|
||||||
test_erasebackword.out \
|
test_erasebackword.out \
|
||||||
test_eval.out \
|
test_eval.out \
|
||||||
test_fixeol.out \
|
test_fixeol.out \
|
||||||
|
@@ -46,6 +46,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
|
|||||||
test_charsearch.out \
|
test_charsearch.out \
|
||||||
test_close_count.out \
|
test_close_count.out \
|
||||||
test_command_count.out \
|
test_command_count.out \
|
||||||
|
test_comparators.out \
|
||||||
test_erasebackword.out \
|
test_erasebackword.out \
|
||||||
test_eval.out \
|
test_eval.out \
|
||||||
test_fixeol.out \
|
test_fixeol.out \
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
||||||
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
||||||
#
|
#
|
||||||
# Last change: 2015 Aug 11
|
# Last change: 2015 Sep 01
|
||||||
#
|
#
|
||||||
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
||||||
# Edit the lines in the Configuration section below to select.
|
# Edit the lines in the Configuration section below to select.
|
||||||
@@ -105,6 +105,7 @@ SCRIPT = test1.out test2.out test3.out test4.out test5.out \
|
|||||||
test_charsearch.out \
|
test_charsearch.out \
|
||||||
test_close_count.out \
|
test_close_count.out \
|
||||||
test_command_count.out \
|
test_command_count.out \
|
||||||
|
test_comparators.out \
|
||||||
test_erasebackword.out \
|
test_erasebackword.out \
|
||||||
test_eval.out \
|
test_eval.out \
|
||||||
test_fixeol.out \
|
test_fixeol.out \
|
||||||
|
@@ -42,6 +42,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
|
|||||||
test_charsearch.out \
|
test_charsearch.out \
|
||||||
test_close_count.out \
|
test_close_count.out \
|
||||||
test_command_count.out \
|
test_command_count.out \
|
||||||
|
test_comparators.out \
|
||||||
test_erasebackword.out \
|
test_erasebackword.out \
|
||||||
test_eval.out \
|
test_eval.out \
|
||||||
test_fixeol.out \
|
test_fixeol.out \
|
||||||
|
21
src/testdir/test_comparators.in
Normal file
21
src/testdir/test_comparators.in
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
" Test for expression comparators. vim: set ft=vim :
|
||||||
|
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
:so small.vim
|
||||||
|
:try
|
||||||
|
: let oldisident=&isident
|
||||||
|
: set isident+=#
|
||||||
|
: if 1 is#1
|
||||||
|
: $put ='ok'
|
||||||
|
: else
|
||||||
|
: $put ='ng'
|
||||||
|
: endif
|
||||||
|
:finally
|
||||||
|
: let &isident=oldisident
|
||||||
|
:endtry
|
||||||
|
:"
|
||||||
|
:/^marker/+1,$wq! test.out
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
marker
|
1
src/testdir/test_comparators.ok
Normal file
1
src/testdir/test_comparators.ok
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ok
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
844,
|
||||||
/**/
|
/**/
|
||||||
843,
|
843,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user