Refactoring step.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5f568db2990521dc2a2bbe019df155ec0b0997a..e1a67725f6b0e9041136c72c9a10e3d8ea4a2b5e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
        ignorted in VC-Dired listings, heading off lots of expensive calls
        to (vc-state).
 
+       * vc.el (vc-dired-hook): Refactoring step.  
+
 2007-12-27  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * ps-print.el (ps-mark-active-p): Fun returned back.
@@ -18,12 +20,12 @@
        with 'e' in a log-view buffer.  Not documented yet as this
        only works for SCCS, RCS, and maybe CVS if you have admin
        privileges.  When we have backend support for Subversion and
-       more modern systems it will ve time to write this up.
+       more modern systems it will be time to write this up.
 
 2007-12-27  Kenichi Handa  <handa@ni.aist.go.jp>
 
        * international/mule-cmds.el (select-safe-coding-system): When a
-       buffer is modfied, cancel the writing.
+       buffer is modified, cancel the writing.
 
 2007-12-26  Eric S. Raymond  <esr@snark.thyrsus.com>
 

diff --git a/lisp/vc.el b/lisp/vc.el
index eca24b124d0080709c3e79a43618f0e181bf57a9..3e3fa907ed992f0347fa6f6f940f882ed6481818 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2387,13 +2387,16 @@ Called by dired after any portion of a vc-dired buffer has been read in."
         ((vc-dired-ignorable-p filename)
          (dired-kill-line))
          ;; ordinary file -- call the (possibly expensive) state query
-         ((and (vc-backend filename)
-              (not (and vc-dired-terse-mode
-                        (vc-up-to-date-p filename))))
-          (vc-dired-reformat-line (vc-call dired-state-info filename))
-          (forward-line 1))
          (t
-          (dired-kill-line))))
+         (let ((backend (vc-backend filename)))
+           (cond
+            ((and backend
+                  (not (and vc-dired-terse-mode
+                            (vc-up-to-date-p filename))))
+             (vc-dired-reformat-line (vc-call dired-state-info filename))
+             (forward-line 1))
+            (t
+             (dired-kill-line)))))))
        ;; any other line
        (t (forward-line 1))))
     (vc-dired-purge))