[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      07/11/07 15:31:21

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1149.2.16
retrieving revision 1.1149.2.17
diff -u -b -r1.1149.2.16 -r1.1149.2.17
--- xdisp.c     4 Nov 2007 07:42:21 -0000       1.1149.2.16
+++ xdisp.c     7 Nov 2007 15:31:20 -0000       1.1149.2.17
@@ -3369,9 +3369,9 @@
       Lisp_Object from_overlay
        = (it->current.overlay_string_index >= 0
           ? it->string_overlays[it->current.overlay_string_index]
-          : from_overlay);
+          : Qnil);
 
-      /* See we got to this string directly or indirectly from
+      /* See if we got to this string directly or indirectly from
         an overlay property.  That includes the before-string or
         after-string of an overlay, strings in display properties
         provided by an overlay, their text properties, etc.