mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Dan Nicolaescu 2009-02-25 04:00:08 +00:00
parent bd6e492c7c
commit 02ffe8e3ab
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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>

12
lisp/vc-dir.el
View File

@ -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)