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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1047 emacs/src/xdisp.c:1.1048
*** emacs/src/xdisp.c:1.1047    Wed Sep  7 08:46:04 2005
--- emacs/src/xdisp.c   Wed Sep  7 21:59:36 2005
***************
*** 3428,3434 ****
      }
    else
      {
!       object = it->w->buffer;
        position = &it->current.pos;
      }
  
--- 3428,3434 ----
      }
    else
      {
!       XSETWINDOW (object, it->w);
        position = &it->current.pos;
      }
  
***************
*** 3448,3453 ****
--- 3448,3456 ----
                             Qdisplay, object);
    if (NILP (prop))
      return HANDLED_NORMALLY;
+ 
+   if (!STRINGP (it->string))
+     object = it->w->buffer;
  
    if (CONSP (prop)
        /* Simple properties.  */