(init_from_display_pos): Don't compare the result

of calling index with NULL.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a82065ceb57ed2b41e09e1c2189e2313db3b176..9546438a4343f8430597f14dccd751edd6e0f5a5 100644 (file)
--- 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 a683d8b09684afa10172e63dcd93950748a97c69..4f906483c93c10277e880b18b41e4f8857d54930 100644 (file)
--- 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;