(handle_invisible_prop): After setting up an ellipsis, return HANDLED_RETURN.

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 7a40c7ccb91b09c7ada235ab62140f07bbd3dbae..f579466c49f5ff3e90dd9c84236051c068ed2ec3 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -85,16 +85,6 @@ Report by Sebastien Rocca Serra <sroccaserra@gmail.com> 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 <r.thiel@uni-jena.de> 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 8983ba5bf378fd4d87b10d7988dd0192a78c89d2..1a535bc7872d88c1dec8ad9802062ac411cf4acc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-09  Richard Stallman  <rms@gnu.org>
+
+       * xdisp.c (handle_invisible_prop): After setting up an ellipsis,
+       return HANDLED_RETURN.
+
 2007-10-06  Martin Rudalics  <rudalics@gmx.at>
 
        * keyboard.c (kbd_buffer_get_event): Break loop waiting for input

diff --git a/src/xdisp.c b/src/xdisp.c
index 451d953ce09ecc57ab7c1a2176c9857ddfbd9588..22a0b9dbe05902f33ae7820c67fc2eb80b4b2505 100644 (file)
--- 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;
             }
        }
     }