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

(vc-deduce-fileset): Return the currently selected file if

Browse Source 
no files are selected when using vc-status.
This commit is contained in:
Dan Nicolaescu 2008-01-09 07:21:08 +00:00
parent 65efc5388d
commit e11c1d937f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/ChangeLog
View File

@ -1,19 +1,24 @@
2008-01-09 Dan Nicolaescu <dann@ics.uci.edu>
* vc.el (vc-deduce-fileset): Return the currently selected file if
no files are selected when using vc-status.
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*.el: commented out declare-function. "make bootstrap"
stops with an error and emacs does not compile with those things in.
Besides, declare-function is not defined in XEmacs.
* ediff-util (eqiff-quit): autoraise minibuffer.
* ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin
* viper*.el: commented out declare-function -- not defined in XEmacs.
* viper-ex.el (viper-info-on-file): take care of indiret buffers.
* viper.el (viper-set-hooks, set-cursor-color): set viper-vi-state-cursor-color.
2008-01-09 Tom Tromey <tromey@redhat.com>
* vc.el (vc-status-headers): Rename from

9
lisp/vc.el
View File

@ -1276,9 +1276,12 @@ Otherwise, throw an error."
(unless (eq (vc-backend f) firstbackend)
(error "All members of a fileset must be under the same version-control system."))))
marked))
((eq major-mode 'vc-status-mode)
(vc-status-marked-files))
((vc-backend buffer-file-name)
((eq major-mode 'vc-status-mode)
(let ((marked (vc-status-marked-files)))
(if marked
marked
(list (vc-status-current-file)))))
((vc-backend buffer-file-name)
(list buffer-file-name))
((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer)
(with-current-buffer vc-parent-buffer