[Emacs-diffs] emacs/lisp ChangeLog vc-dir.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/02/25 04:00:20

Modified files:
        lisp           : ChangeLog vc-dir.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15396&r2=1.15397
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dir.el?cvsroot=emacs&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15396
retrieving revision 1.15397
diff -u -b -r1.15396 -r1.15397
--- ChangeLog   25 Feb 2009 03:44:18 -0000      1.15396
+++ ChangeLog   25 Feb 2009 04:00:08 -0000      1.15397
@@ -1,6 +1,10 @@
+2009-02-25  Dan Nicolaescu  <address@hidden>
+
+       * vc-dir.el (vc-dir-update): Make sure ./ is always first in the 
listing.
+
 2009-02-25  David Reitter <address@hidden>
 
-       * mail/mailclient.el: declare clipboard-kill-ring-save
+       * mail/mailclient.el (clipboard-kill-ring-save): Declare.
 
 2009-02-25  Kenichi Handa  <address@hidden>
 

Index: vc-dir.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-dir.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- vc-dir.el   11 Feb 2009 06:36:34 -0000      1.36
+++ vc-dir.el   25 Feb 2009 04:00:16 -0000      1.37
@@ -351,13 +351,13 @@
                     ((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))))
+                 dotname nil nil nil (expand-file-name default-directory)))
        (setq node (ewoc-nth vc-ewoc 0)))
 
       (while (and entry node)
@@ -372,6 +372,8 @@
            ;; 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)