[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107989: Fix display when left-fri
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107989: Fix display when left-fringe/right-fringe display spec is invalid. |
Date: |
Fri, 11 May 2012 17:05:06 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107989
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-05-11 17:05:06 +0300
message:
Fix display when left-fringe/right-fringe display spec is invalid.
src/xdisp.c (handle_single_display_spec): Return 1 for left-margin
and right-margin display specs even if the spec is invalid or we
are on a TTY, and thus unable to display on the fringes. That's
because the text with the property will not be displayed anyway,
so we need to signal to the caller that this is a "replacing"
display spec. This fixes display when the spec is invalid or we
are on a TTY.
modified:
src/ChangeLog
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-05-09 19:44:19 +0000
+++ b/src/ChangeLog 2012-05-11 14:05:06 +0000
@@ -1,3 +1,13 @@
+2012-05-11 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (handle_single_display_spec): Return 1 for left-margin
+ and right-margin display specs even if the spec is invalid or we
+ are on a TTY, and thus unable to display on the fringes. That's
+ because the text with the property will not be displayed anyway,
+ so we need to signal to the caller that this is a "replacing"
+ display spec. This fixes display when the spec is invalid or we
+ are on a TTY.
+
2012-05-09 Paul Eggert <address@hidden>
* unexaix.c (make_hdr): Fix typo in prototype.
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-04-29 17:19:08 +0000
+++ b/src/xdisp.c 2012-05-11 14:05:06 +0000
@@ -4681,10 +4681,10 @@
if (!FRAME_WINDOW_P (it->f))
/* If we return here, POSITION has been advanced
across the text with this property. */
- return 0;
+ return 1;
}
else if (!frame_window_p)
- return 0;
+ return 1;
#ifdef HAVE_WINDOW_SYSTEM
value = XCAR (XCDR (spec));
@@ -4692,7 +4692,7 @@
|| !(fringe_bitmap = lookup_fringe_bitmap (value)))
/* If we return here, POSITION has been advanced
across the text with this property. */
- return 0;
+ return 1;
if (it)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r107989: Fix display when left-fringe/right-fringe display spec is invalid.,
Eli Zaretskii <=