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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/08/26 06:45:41

Modified files:
        lisp           : ChangeLog vc-dir.el 

Log message:
        (vc-dir-node-directory, vc-dir-update): Get the parent
        directory correctly in case the item is a directory itself.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16014&r2=1.16015
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dir.el?cvsroot=emacs&r1=1.40&r2=1.41

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16014
retrieving revision 1.16015
diff -u -b -r1.16014 -r1.16015
--- ChangeLog   26 Aug 2009 05:26:22 -0000      1.16014
+++ ChangeLog   26 Aug 2009 06:45:36 -0000      1.16015
@@ -1,5 +1,8 @@
 2009-08-26  Dan Nicolaescu  <address@hidden>
 
+       * vc-dir.el (vc-dir-node-directory, vc-dir-update): Get the parent
+       directory correctly in case the item is a directory itself.
+
        * vc.el: Document the desired behavior for reverted files in the
        `added' state.
 

Index: vc-dir.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-dir.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- vc-dir.el   24 Jul 2009 05:41:24 -0000      1.40
+++ vc-dir.el   26 Aug 2009 06:45:41 -0000      1.41
@@ -326,8 +326,9 @@
     (or (vc-dir-fileinfo->directory data)
        ;; Otherwise compute it from the file name.
        (file-name-directory
+        (directory-file-name
         (expand-file-name
-         (vc-dir-fileinfo->name data))))))
+          (vc-dir-fileinfo->name data)))))))
 
 (defun vc-dir-update (entries buffer &optional noinsert)
   "Update BUFFER's ewoc from the list of ENTRIES.
@@ -343,8 +344,10 @@
          ;; names too many times
          (sort entries
                (lambda (entry1 entry2)
-                 (let ((dir1 (file-name-directory (expand-file-name (car 
entry1))))
-                       (dir2 (file-name-directory (expand-file-name (car 
entry2)))))
+                 (let ((dir1 (file-name-directory
+                               (directory-file-name (expand-file-name (car 
entry1)))))
+                       (dir2 (file-name-directory
+                              (directory-file-name (expand-file-name (car 
entry2))))))
                    (cond
                     ((string< dir1 dir2) t)
                     ((not (string= dir1 dir2)) nil)
@@ -362,8 +365,10 @@
 
       (while (and entry node)
        (let* ((entryfile (car entry))
-              (entrydir (file-name-directory (expand-file-name entryfile)))
+              (entrydir (file-name-directory (directory-file-name
+                                              (expand-file-name entryfile))))
               (nodedir (vc-dir-node-directory node)))
+         (message "entryfile %s entrydir %s" entryfile entrydir)
          (cond
           ;; First try to find the directory.
           ((string-lessp nodedir entrydir)
@@ -406,7 +411,8 @@
       (unless (or node noinsert)
        (let ((lastdir (vc-dir-node-directory (ewoc-nth vc-ewoc -1))))
          (dolist (entry entries)
-           (let ((entrydir (file-name-directory (expand-file-name (car 
entry)))))
+           (let ((entrydir (file-name-directory
+                            (directory-file-name (expand-file-name (car 
entry))))))
              ;; Insert a directory node if needed.
              (unless (string-equal lastdir entrydir)
                (setq lastdir entrydir)