(vc-dir-move-to-goal-column): Don't move in an

empty line.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5521c6b7ddd4769abf095fdaaca94185033a138f..ea99adb5dc4acc036a4acc812fb4adf92b937e31 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-08  Andreas Schwab  <schwab@suse.de>
 
+       * vc-dispatcher.el (vc-dir-move-to-goal-column): Don't move in an
+       empty line.
+
        * minibuffer.el (minibuffer-message): Bind inhibit-quit around
        sit-for.
 

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index dd4d20314ed36746f1e0059a7e43df7a96f2f31e..7179d77e8f4861dfe9458427b5fe9ddf5ac711eb 100644 (file)
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -676,8 +676,9 @@ See `run-hooks'."
 (defun vc-dir-move-to-goal-column ()
   ;; Used to keep the cursor on the file name column.
   (beginning-of-line)
-  ;; Must be in sync with vc-default-status-printer.
-  (forward-char 25))
+  (unless (eolp)
+    ;; Must be in sync with vc-default-status-printer.
+    (forward-char 25)))
 
 (defun vc-dir-prepare-status-buffer (bname dir &optional create-new)
   "Find a buffer named BNAME showing DIR, or create a new one."