From: Richard M. Stallman Date: Tue, 9 Oct 2007 01:32:25 +0000 (+0000) Subject: (handle_invisible_prop): After setting up an ellipsis, return HANDLED_RETURN. X-Git-Tag: emacs-pretest-22.1.90~648 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec406436ee6c309997ff7914e978df2358b6f414;p=emacs.git (handle_invisible_prop): After setting up an ellipsis, return HANDLED_RETURN. --- diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 7a40c7ccb91..f579466c49f 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -85,16 +85,6 @@ Report by Sebastien Rocca Serra on emacs-devel from 2007-08-30. martin rudalics has a potential patch. http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01632.html -** GNU NT-Emacs crashes with longlines-mode and outline-mode -Reported by Rainer Thiel on emacs-pretest-bug -from 2007-09-22. -http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01996.html -Jason Rumney has a recipe for reproducing this on GNU/Linux: -http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02267.html -Minimum cause: "It occurs when the character before the display -property is replaced with an ellipsis" -http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00046.html - * FIXES FOR EMACS 22.3 Here we list any small fixes that arrived too late for Emacs 22.2, but diff --git a/src/ChangeLog b/src/ChangeLog index 8983ba5bf37..1a535bc7872 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-10-09 Richard Stallman + + * xdisp.c (handle_invisible_prop): After setting up an ellipsis, + return HANDLED_RETURN. + 2007-10-06 Martin Rudalics * keyboard.c (kbd_buffer_get_event): Break loop waiting for input diff --git a/src/xdisp.c b/src/xdisp.c index 451d953ce09..22a0b9dbe05 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3719,6 +3719,10 @@ handle_invisible_prop (it) it->position.bytepos = CHAR_TO_BYTE (it->position.charpos); } setup_for_ellipsis (it, 0); + /* Let the ellipsis display before + considering any properties of the following char. + Fixes jasonr@gnu.org 01 Oct 07 bug. */ + handled = HANDLED_RETURN; } } }