From: Chris Allegretta <chrisa@asty.org>
Date: Sun, 15 Nov 2015 06:48:56 +0000 (+0000)
Subject: Backport r5355 from trunk.
X-Git-Tag: v2.4.3~8
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=af6dd93510e0d3ce5ed2724e0df4acaa4837266f;p=nano.git

Backport r5355 from trunk.

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_4_branch@5416 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 02975bcb..b9302b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-13  Benno Schulenberg  <bensberg@justemail.net>
+	* src/search.c (do_find_bracket): Remove mistaken comparison between
+	pointer and literal character.  Found with cppcheck.
+
 2015-08-11  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (write_file): Avoid calling copy_file() with a null
 	pointer.  Found with cppcheck.
diff --git a/src/search.c b/src/search.c
index 6500bd5e..cbeefccd 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1129,7 +1129,7 @@ void do_find_bracket(void)
 
     ch = openfile->current->data + openfile->current_x;
 
-    if (ch == '\0' || (ch = mbstrchr(matchbrackets, ch)) == NULL) {
+    if ((ch = mbstrchr(matchbrackets, ch)) == NULL) {
 	statusbar(_("Not a bracket"));
 	return;
     }