From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 7 Sep 2001 11:19:02 +0000 (+0000)
Subject: (init_from_display_pos): Don't compare the result
X-Git-Tag: emacs-pretest-21.0.106~210
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78999117cd9ce7db469ccab4d36003c1263885ba;p=emacs.git

(init_from_display_pos): Don't compare the result
of calling index with NULL.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a82065ceb5..9546438a434 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1296,7 +1296,7 @@
 	(which-function-mode): Remove references to which-func-mode-global.
 
 	* calendar/cal-islam.el (calendar-goto-islamic-date):
-	Add  autoload cookie.
+	Add autoload cookie.
 
 	* play/fortune.el: Add types to defcustoms.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index a683d8b0968..4f906483c93 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1840,7 +1840,7 @@ init_from_display_pos (it, w, pos)
   init_iterator (it, w, charpos, bytepos, NULL, DEFAULT_FACE_ID);
 
   for (i = 0; i < it->n_overlay_strings; ++i)
-    if (index (XSTRING (it->overlay_strings[i])->data, '\n') != NULL)
+    if (index (XSTRING (it->overlay_strings[i])->data, '\n'))
       {
 	overlay_strings_with_newlines = 1;
 	break;