From: Andreas Schwab <schwab@suse.de>
Date: Sun, 8 Jun 2008 14:53:18 +0000 (+0000)
Subject: (vc-dir-move-to-goal-column): Don't move in an
X-Git-Tag: emacs-pretest-23.0.90~5003
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c99657a5587beecba9039b5540e927abaf4a9720;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5521c6b7ddd..ea99adb5dc4 100644
--- 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 dd4d20314ed..7179d77e8f4 100644
--- 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."