[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el,v |
Date: |
Fri, 20 Jul 2007 03:59:05 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 07/07/20 03:59:04
Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -b -r1.439 -r1.440
--- vc.el 20 Jul 2007 01:22:18 -0000 1.439
+++ vc.el 20 Jul 2007 03:59:02 -0000 1.440
@@ -998,9 +998,7 @@
(defun vc-delistify (filelist)
"Smash a FILELIST into a file list string suitable for info messages."
- (cond ((not filelist) ".")
- ((= (length filelist) 1) (car filelist))
- (t (concat (car filelist) " " (vc-delistify (cdr filelist))))))
+ (if (not filelist) "." (mapconcat 'identity filelist " ")))
(defvar w32-quote-process-args)
;;;###autoload
@@ -1020,10 +1018,8 @@
;; it doesn't look at the actual file-system to see if symlinks
;; come into play.
(let* ((files
- (mapcar 'file-relative-name
- (cond ((not file-or-list) '())
- ((listp file-or-list) (mapcar 'expand-file-name
file-or-list))
- (t (list (expand-file-name file-or-list))))))
+ (mapcar (lambda (f) (file-relative-name (expand-file-name f)))
+ (if (listp file-or-list) file-or-list (list file-or-list))))
(full-command
(concat command " " (vc-delistify flags) " " (vc-delistify files))))
(if vc-command-messages
@@ -1555,9 +1551,11 @@
(defun vc-expand-dirs (file-or-dir-list)
"Expands directories in a file list specification.
Only files already under version control are noticed."
+ ;; FIXME: Kill this function.
(let ((flattened '()))
(dolist (node file-or-dir-list)
- (vc-file-tree-walk node (lambda (f) (if (vc-backend f) (setq flattened
(cons f flattened))))))
+ (vc-file-tree-walk
+ node (lambda (f) (if (vc-backend f) (push f flattened)))))
(nreverse flattened)))
(defun vc-resynch-window (file &optional keep noquery)
@@ -3492,6 +3490,7 @@
(defun vc-file-tree-walk (dirname func &rest args)
"Walk recursively through DIRNAME.
Invoke FUNC f ARGS on each VC-managed file f underneath it."
+ ;; FIXME: Kill this function.
(vc-file-tree-walk-internal (expand-file-name dirname) func args)
(message "Traversing directory %s...done" dirname))
@@ -3507,7 +3506,7 @@
(member f vc-directory-exclusion-list)
(let ((dirf (expand-file-name f dir)))
(or
- (file-symlink-p dirf);; Avoid possible loops
+ (file-symlink-p dirf) ;; Avoid possible loops.
(vc-file-tree-walk-internal dirf func args)))))
(directory-files dir)))))
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/06
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Stefan Monnier, 2007/07/07
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Stefan Monnier, 2007/07/07
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/17
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Eric S. Raymond, 2007/07/18
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Eric S. Raymond, 2007/07/18
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Eric S. Raymond, 2007/07/19
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/19
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/19
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/19
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/22
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Miles Bader, 2007/07/23
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Miles Bader, 2007/07/26
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2007/07/26
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Masatake YAMATO, 2007/07/28
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Stefan Monnier, 2007/07/30