(vc-dir-update): Make sure ./ is always first in the listing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17ff4093e45c28c89ffb746014691202496ec6c9..415324d3d45a3b7675b092fdd498608d731faf44 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
+2009-02-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-dir.el (vc-dir-update): Make sure ./ is always first in the listing.
+
 2009-02-25  David Reitter <david.reitter@gmail.com>
 
-       * mail/mailclient.el: declare clipboard-kill-ring-save
+       * mail/mailclient.el (clipboard-kill-ring-save): Declare.
 
 2009-02-25  Kenichi Handa  <handa@m17n.org>
 

diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 93e081c0f9bce123dbf70215ea1d34a653e83430..d2414f9172ff284a8c7b6c2fbc0708f30a4e2e10 100644 (file)
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -351,13 +351,13 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
                     ((string< (car entry1) (car entry2))))))))
     ;; Insert directory entries in the right places.
     (let ((entry (car entries))
-         (node (ewoc-nth vc-ewoc 0)))
+         (node (ewoc-nth vc-ewoc 0))
+         (dotname (file-relative-name default-directory)))
       ;; Insert . if it is not present.
       (unless node
-       (let ((rd (file-relative-name default-directory)))
-         (ewoc-enter-last
-          vc-ewoc (vc-dir-create-fileinfo
-                   rd nil nil nil (expand-file-name default-directory))))
+       (ewoc-enter-last
+        vc-ewoc (vc-dir-create-fileinfo
+                 dotname nil nil nil (expand-file-name default-directory)))
        (setq node (ewoc-nth vc-ewoc 0)))
 
       (while (and entry node)
@@ -372,6 +372,8 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
            ;; Found the directory, find the place for the file name.
            (let ((nodefile (vc-dir-fileinfo->name (ewoc-data node))))
              (cond
+              ((string= nodefile dotname)
+               (setq node (ewoc-next vc-ewoc node)))
               ((string-lessp nodefile entryfile)
                (setq node (ewoc-next vc-ewoc node)))
               ((string-equal nodefile entryfile)