Avoid beginning/end of buffer errors when moving across display strings.

 lisp/simple.el (line-move-visual): Signal beginning/end of buffer
 only if vertical-motion moved less than it was requested.  Avoids
 silly incorrect error messages when there are display strings with
 multiple newlines at EOL.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aded31287b6b859dbf2137cef0abdd7923090549..1abcc9338472450285cc4ddcdbbd20800c98aaf4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+       * simple.el (line-move-visual): Signal beginning/end of buffer
+       only if vertical-motion moved less than it was requested.  Avoids
+       silly incorrect error messages when there are display strings with
+       multiple newlines at EOL.
+
 2013-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/vera-mode.el (vera-underscore-is-part-of-word):

diff --git a/lisp/simple.el b/lisp/simple.el
index 103c2a4636cd58f3352fdf2a8fa4877dd7ec3073..e4bde7c358c9e03dedaf16b8ecf35c0ff56c1d36 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4857,13 +4857,25 @@ lines."
                         (frame-char-width)) hscroll))))))
     (if target-hscroll
        (set-window-hscroll (selected-window) target-hscroll))
-    (or (and (= (vertical-motion
-                (cons (or goal-column
-                          (if (consp temporary-goal-column)
-                              (car temporary-goal-column)
-                            temporary-goal-column))
-                      arg))
-               arg)
+    ;; vertical-motion can move more than it was asked to if it moves
+    ;; across display strings with newlines.  We don't want to ring
+    ;; the bell and announce beginning/end of buffer in that case.
+    (or (and (or (and (>= arg 0)
+                     (>= (vertical-motion
+                          (cons (or goal-column
+                                    (if (consp temporary-goal-column)
+                                        (car temporary-goal-column)
+                                      temporary-goal-column))
+                                arg))
+                         arg))
+                (and (< arg 0)
+                     (<= (vertical-motion
+                          (cons (or goal-column
+                                    (if (consp temporary-goal-column)
+                                        (car temporary-goal-column)
+                                      temporary-goal-column))
+                                arg))
+                         arg)))
             (or (>= arg 0)
                 (/= (point) opoint)
                 ;; If the goal column lies on a display string,