[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v |
Date: |
Mon, 10 Mar 2008 00:49:53 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/03/10 00:49:48
Index: src/xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1199
retrieving revision 1.1200
diff -u -b -r1.1199 -r1.1200
--- src/xdisp.c 8 Mar 2008 22:39:56 -0000 1.1199
+++ src/xdisp.c 10 Mar 2008 00:49:46 -0000 1.1200
@@ -4331,15 +4331,13 @@
`display' property yet. The call to pop_it in
set_iterator_to_next will clean this up. */
if (BUFFERP (object))
- it->current.pos = start_pos;
+ *position = start_pos;
}
else if (CONSP (value) && EQ (XCAR (value), Qspace))
{
it->method = GET_FROM_STRETCH;
it->object = value;
- it->position = start_pos;
- if (BUFFERP (object))
- it->current.pos = start_pos;
+ *position = it->position = start_pos;
}
#ifdef HAVE_WINDOW_SYSTEM
else
@@ -4353,8 +4351,7 @@
/* Say that we haven't consumed the characters with
`display' property yet. The call to pop_it in
set_iterator_to_next will clean this up. */
- if (BUFFERP (object))
- it->current.pos = start_pos;
+ *position = start_pos;
}
#endif /* HAVE_WINDOW_SYSTEM */
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kim F. Storm, 2008/03/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v,
Miles Bader <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/03/19
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/03/26
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/03/28