[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v
From: |
Eric S. Raymond |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v |
Date: |
Thu, 15 May 2008 01:11:27 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Eric S. Raymond <esr> 08/05/15 01:11:24
Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- vc-dispatcher.el 11 May 2008 15:36:33 -0000 1.42
+++ vc-dispatcher.el 15 May 2008 01:11:23 -0000 1.43
@@ -1352,19 +1352,30 @@
member))
(defun vc-dispatcher-selection-set (&optional observer)
- "Deduce a set of files to which to apply an operation. Return the fileset.
+ "Deduce a set of files to which to apply an operation. Return a cons
+cell (SELECTION . FILESET), where SELECTION is what the user chose
+and FILES is the flist with any directories replaced by the listed files
+within them.
+
If we're in a directory display, the fileset is the list of marked files (if
there is one) else the file on the curreent line. If not in a directory
display, but the current buffer visits a file, the fileset is a singleton
containing that file. Otherwise, throw an error."
- (let ((files
+ (let ((selection
(cond
;; Browsing with vc-dir
((vc-dispatcher-browsing)
- (or (vc-dir-marked-files) (list (vc-dir-current-file))))
+ ;; If no files are marked, temporatrily mark current file
+ ;; and choose on that basis (so we get subordinate files)
+ (if (not (vc-dir-marked-files))
+ (prog2
+ (vc-dir-mark-file)
+ (cons (vc-dir-marked-files) (vc-dir-marked-only-files))
+ (vc-dir-unmark-all-files t))
+ (cons (vc-dir-marked-files) (vc-dir-marked-only-files))))
;; Visiting an eligible file
((buffer-file-name)
- (list buffer-file-name))
+ (cons (list buffer-file-name) (list buffer-file-name)))
;; No eligible file -- if there's a parent buffer, deduce from there
((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer)
(with-current-buffer vc-parent-buffer
@@ -1378,8 +1389,8 @@
;; buffers visiting the fileset don't match the on-disk contents.
(if (not observer)
(save-some-buffers
- nil (lambda () (vc-dispatcher-in-fileset-p files))))
- files))
+ nil (lambda () (vc-dispatcher-in-fileset-p (cdr selection)))))
+ selection))
(provide 'vc-dispatcher)
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/09
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/09
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/09
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/10
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/10
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Dan Nicolaescu, 2008/05/10
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Dan Nicolaescu, 2008/05/10
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Dan Nicolaescu, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v,
Eric S. Raymond <=
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/15
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/15
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/15
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/15
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Eric S. Raymond, 2008/05/15
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, John Paul Wallington, 2008/05/16
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, John Paul Wallington, 2008/05/16
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Andreas Schwab, 2008/05/17
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Glenn Morris, 2008/05/17
- [Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v, Glenn Morris, 2008/05/17