procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* vc-dir.el (vc-dir): Complete only directory names.

Browse source
This commit is contained in:
Juanma Barranquero 2008-06-27 23:29:15 +00:00
parent 7992f52c27
commit a1fc8acb0f
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2008-06-27 Juanma Barranquero <lekktu@gmail.com>
* vc-dir.el (vc-dir): Complete only directory names.
2008-06-27 Jason Rumney <jasonr@gnu.org> 2008-06-27 Jason Rumney <jasonr@gnu.org>
* w32-fns.el (top-level): Unconditionally define all charsets. * w32-fns.el (top-level): Unconditionally define all charsets.
@ -8,7 +12,7 @@
the CC Mode specific functions; this is no longer needed, since the CC Mode specific functions; this is no longer needed, since
{beginning,end}-of-defun now pass ARG to ...-of-defun-function. {beginning,end}-of-defun now pass ARG to ...-of-defun-function.
* progmodes/cc-defs.el (c-emacs-features): new feature * progmodes/cc-defs.el (c-emacs-features): New feature
'argumentative-bod-function. 'argumentative-bod-function.
2008-06-27 John Paul Wallington <jpw@pobox.com> 2008-06-27 John Paul Wallington <jpw@pobox.com>

25
lisp/vc-dir.el
View file

@ -27,13 +27,13 @@
;; This implementation was inspired by PCL-CVS. ;; This implementation was inspired by PCL-CVS.
;; Many people contributed comments, ideas and code to this ;; Many people contributed comments, ideas and code to this
;; implementation. These include: ;; implementation. These include:
;; ;;
;; Alexandre Julliard <julliard@winehq.org> ;; Alexandre Julliard <julliard@winehq.org>
;; Stefan Monnier <monnier@iro.umontreal.ca> ;; Stefan Monnier <monnier@iro.umontreal.ca>
;; Tom Tromey <tromey@redhat.com> ;; Tom Tromey <tromey@redhat.com>
;;; Commentary: ;;; Commentary:
;; ;;
;;; Todo: see vc.el. ;;; Todo: see vc.el.
@ -339,7 +339,7 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
vc-ewoc (vc-dir-create-fileinfo vc-ewoc (vc-dir-create-fileinfo
rd nil nil nil (expand-file-name default-directory)))) rd nil nil nil (expand-file-name default-directory))))
(setq node (ewoc-nth vc-ewoc 0))) (setq node (ewoc-nth vc-ewoc 0)))
(while (and entry node) (while (and entry node)
(let* ((entryfile (car entry)) (let* ((entryfile (car entry))
(entrydir (file-name-directory (expand-file-name entryfile))) (entrydir (file-name-directory (expand-file-name entryfile)))
@ -359,7 +359,7 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
(setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry)) (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry))
(setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil) (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil)
(ewoc-invalidate vc-ewoc node) (ewoc-invalidate vc-ewoc node)
(setq entries (cdr entries)) (setq entries (cdr entries))
(setq entry (car entries)) (setq entry (car entries))
(setq node (ewoc-next vc-ewoc node))) (setq node (ewoc-next vc-ewoc node)))
(t (t
@ -712,7 +712,7 @@ child files."
(setq data (ewoc-data crt)) (setq data (ewoc-data crt))
(vc-dir-node-directory crt)))) (vc-dir-node-directory crt))))
(unless (vc-dir-fileinfo->directory data) (unless (vc-dir-fileinfo->directory data)
(push (push
(cons (expand-file-name (vc-dir-fileinfo->name data)) (cons (expand-file-name (vc-dir-fileinfo->name data))
(vc-dir-fileinfo->state data)) (vc-dir-fileinfo->state data))
result)))) result))))
@ -739,11 +739,11 @@ If it is a file, return the corresponding cons for the file itself."
(setq data (ewoc-data crt)) (setq data (ewoc-data crt))
(vc-dir-node-directory crt)))) (vc-dir-node-directory crt))))
(unless (vc-dir-fileinfo->directory data) (unless (vc-dir-fileinfo->directory data)
(push (push
(cons (expand-file-name (vc-dir-fileinfo->name data)) (cons (expand-file-name (vc-dir-fileinfo->name data))
(vc-dir-fileinfo->state data)) (vc-dir-fileinfo->state data))
result)))) result))))
(push (push
(cons (expand-file-name (vc-dir-fileinfo->name crt-data)) (cons (expand-file-name (vc-dir-fileinfo->name crt-data))
(vc-dir-fileinfo->state crt-data)) result)) (vc-dir-fileinfo->state crt-data)) result))
result)) result))
@ -752,7 +752,7 @@ If it is a file, return the corresponding cons for the file itself."
"Update the entries for FILE in any directory buffers that list it." "Update the entries for FILE in any directory buffers that list it."
(let ((file (or fname (expand-file-name buffer-file-name)))) (let ((file (or fname (expand-file-name buffer-file-name))))
(if (file-directory-p file) (if (file-directory-p file)
;; FIXME: Maybe this should never happen? ;; FIXME: Maybe this should never happen?
;; FIXME: But it is useful to update the state of a directory ;; FIXME: But it is useful to update the state of a directory
;; (more precisely the files in the directory) after some VC ;; (more precisely the files in the directory) after some VC
;; operations. ;; operations.
@ -958,7 +958,7 @@ outside of VC) and one wants to do some operation on it."
(setq only-files-list (vc-dir-marked-only-files-and-states)))) (setq only-files-list (vc-dir-marked-only-files-and-states))))
(let ((crt (vc-dir-current-file))) (let ((crt (vc-dir-current-file)))
(setq files (list crt)) (setq files (list crt))
(when state-model-only-files (when state-model-only-files
(setq only-files-list (vc-dir-child-files-and-states))))) (setq only-files-list (vc-dir-child-files-and-states)))))
(when state-model-only-files (when state-model-only-files
@ -981,7 +981,8 @@ With a prefix argument ask what VC backend to use."
(interactive (interactive
(list (list
(read-file-name "VC status for directory: " (read-file-name "VC status for directory: "
default-directory default-directory t) default-directory default-directory t
nil #'file-directory-p)
(if current-prefix-arg (if current-prefix-arg
(intern (intern
(completing-read (completing-read
@ -1028,8 +1029,8 @@ With a prefix argument ask what VC backend to use."
'face 'face
(if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face) (if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face)
'help-echo 'help-echo
(if isdir (if isdir
"Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
"File\nmouse-3: Pop-up menu") "File\nmouse-3: Pop-up menu")
'mouse-face 'highlight)))) 'mouse-face 'highlight))))