* lisp/vc/vc-dir.el (vc-dir-update): Don't burp in corner case.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0178819df3b..504657358f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/vc-dir.el (vc-dir-update): Don't burp in corner case.
+
 2014-09-04  Lars Ljung  <lars@matholka.se>  (tiny change)
 
         * isearch.el (isearch-yank-word-or-char): Obey superword-mode
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 5e074191577..be3b1fa94b5 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -433,7 +433,8 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
               ;; 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))))