Fix corner case in end-of-visible-line.

* lisp/simple.el (end-of-visible-line): Handle return value of
next-single-property-change properly.

Fixes: debbugs:9371

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8601fb78b753b263b0974b9196027e14b891986e..f844f3f8f32ee7ebd73690133d899e67b6c53656 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Chong Yidong  <cyd@gnu.org>
+
+       * simple.el (end-of-visible-line): Handle return value of
+       next-single-property-change properly (Bug#9371).
+
 2012-03-22  Kenichi Handa  <handa@m17n.org>
 
        * international/quail.el (quail-insert-kbd-layout): Fix previous

diff --git a/lisp/simple.el b/lisp/simple.el
index 936037f5caaa1e2889f4b8b4807d4a6d71da2ddb..8b04534455d4560c87d9953a500f22e481bd49dd 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3688,7 +3688,8 @@ If ARG is zero, move to the beginning of the current line."
                        (assq prop buffer-invisibility-spec))))))
     (skip-chars-forward "^\n")
     (if (get-text-property (point) 'invisible)
-       (goto-char (next-single-property-change (point) 'invisible))
+       (goto-char (or (next-single-property-change (point) 'invisible)
+                      (point-max)))
       (goto-char (next-overlay-change (point))))
     (end-of-line)))
 \f