patch 7.4.844
Problem: When '#' is in 'isident' the is# comparator doesn't work.
Solution: Don't use vim_isIDc(). (Yasuhiro Matsumoto)
diff --git a/src/eval.c b/src/eval.c
index 3650c34..9a590c7 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4431,7 +4431,8 @@
{
if (p[2] == 'n' && p[3] == 'o' && p[4] == 't')
len = 5;
- if (!vim_isIDc(p[len]))
+ i = p[len];
+ if (!isalnum(i) && i != '_')
{
type = len == 2 ? TYPE_EQUAL : TYPE_NEQUAL;
type_is = TRUE;
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 183a809..901a7c1 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -45,6 +45,7 @@
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
@@ -198,6 +199,7 @@
test_charsearch.out: test_charsearch.in
test_close_count.out: test_close_count.in
test_command_count.out: test_command_count.in
+test_comparators.out: test_comparators.in
test_erasebackword.out: test_erasebackword.in
test_eval.out: test_eval.in
test_increment.out: test_increment.in
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 0f9514c..603f4a4 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -44,6 +44,7 @@
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 9ce78bf..1b76bcc 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -66,6 +66,7 @@
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index cac8f9c..08f78cb 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -46,6 +46,7 @@
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index d90f59a..6e77153 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# 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.
# Edit the lines in the Configuration section below to select.
@@ -105,6 +105,7 @@
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 7edebbe..f29ec8b 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -42,6 +42,7 @@
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_comparators.out \
test_erasebackword.out \
test_eval.out \
test_fixeol.out \
diff --git a/src/testdir/test_comparators.in b/src/testdir/test_comparators.in
new file mode 100644
index 0000000..53a12a3
--- /dev/null
+++ b/src/testdir/test_comparators.in
@@ -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
diff --git a/src/testdir/test_comparators.ok b/src/testdir/test_comparators.ok
new file mode 100644
index 0000000..9766475
--- /dev/null
+++ b/src/testdir/test_comparators.ok
@@ -0,0 +1 @@
+ok
diff --git a/src/version.c b/src/version.c
index 215e03b..dadec6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 844,
+/**/
843,
/**/
842,