[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106102: Fix part 4 of bug#9771 with
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106102: Fix part 4 of bug#9771 with assertion violation when wrap-prefix is used |
Date: |
Mon, 17 Oct 2011 19:03:20 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106102
fixes bug(s): http://debbugs.gnu.org/9771
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-17 19:03:20 +0200
message:
Fix part 4 of bug#9771 with assertion violation when wrap-prefix is used
for a line that begins with control characters.
src/xdisp.c (push_display_prop): Determine whether to record string
or buffer position by IT->string, not by IT->method. Allow
GET_FROM_DISPLAY_VECTOR as IT->method on entry.
modified:
src/ChangeLog
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-10-15 10:12:00 +0000
+++ b/src/ChangeLog 2011-10-17 17:03:20 +0000
@@ -1,3 +1,9 @@
+2011-10-17 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (push_display_prop): Determine whether to record string
+ or buffer position by IT->string, not by IT->method. Allow
+ GET_FROM_DISPLAY_VECTOR as IT->method on entry. (Bug#9771, part 4)
+
2011-10-15 Martin Rudalics <address@hidden>
* window.c (coordinates_in_window): Rewrite and delabelize
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2011-10-13 11:17:32 +0000
+++ b/src/xdisp.c 2011-10-17 17:03:20 +0000
@@ -18427,9 +18427,10 @@
push_display_prop (struct it *it, Lisp_Object prop)
{
struct text_pos pos =
- (it->method == GET_FROM_STRING) ? it->current.string_pos : it->current.pos;
+ STRINGP (it->string) ? it->current.string_pos : it->current.pos;
xassert (it->method == GET_FROM_BUFFER
+ || it->method == GET_FROM_DISPLAY_VECTOR
|| it->method == GET_FROM_STRING);
/* We need to save the current buffer/string position, so it will be
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106102: Fix part 4 of bug#9771 with assertion violation when wrap-prefix is used,
Eli Zaretskii <=