[Emacs-diffs] emacs-24 r117483: * lisp/vc/vc-dir.el (vc-dir-update): Don't burp in corner case.

[Stefan Monnier]

------------------------------------------------------------
revno: 117483
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-09-05 13:37:12 -0400
message:
  * lisp/vc/vc-dir.el (vc-dir-update): Don't burp in corner case.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-dir.el              vcdir.el-20091113204419-o5vbwnq5f7feedwu-8693

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-04 16:14:26 +0000
+++ b/lisp/ChangeLog    2014-09-05 17:37:12 +0000
@@ -1,3 +1,7 @@
+2014-09-05  Stefan Monnier  <address@hidden>
+
+       * vc/vc-dir.el (vc-dir-update): Don't burp in corner case.
+
 2014-09-04  Lars Ljung  <address@hidden>  (tiny change)
 
        * isearch.el (isearch-yank-word-or-char): Obey superword-mode

=== modified file 'lisp/vc/vc-dir.el'
--- a/lisp/vc/vc-dir.el 2014-01-01 07:43:34 +0000
+++ b/lisp/vc/vc-dir.el 2014-09-05 17:37:12 +0000
@@ -433,7 +433,8 @@
              ;; previous node was in a different directory.
              (let* ((rd (file-relative-name entrydir))
                     (prev-node (ewoc-prev vc-ewoc node))
-                    (prev-dir (vc-dir-node-directory prev-node)))
+                    (prev-dir (if prev-node
+                                  (vc-dir-node-directory prev-node))))
                (unless (string-equal entrydir prev-dir)
                  (ewoc-enter-before
                   vc-ewoc node (vc-dir-create-fileinfo rd nil nil nil 
entrydir))))