diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-05-11 17:05:06 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-05-11 17:05:06 +0300 |
| commit | 82f9b393c551853b1bea9d32ab834e1999070ab2 (patch) | |
| tree | 0a987c2c47c0b87a2b1bc9fa6361425472f66f41 | |
| parent | d9d1dfefe13b0f0a5f5402ab57bf8d22cd040486 (diff) | |
| download | emacs-82f9b393c551853b1bea9d32ab834e1999070ab2.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0d44f31fb04..9245e81a536 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2012-05-11 Eli Zaretskii <eliz@gnu.org> + + * 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 <eggert@cs.ucla.edu> * unexaix.c (make_hdr): Fix typo in prototype. diff --git a/src/xdisp.c b/src/xdisp.c index cc75d386f0d..fd26853e09b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4681,10 +4681,10 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, 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 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, || !(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) { |