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

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Browse source
This commit is contained in:
Jay Belanger 2015-04-09 19:07:15 -05:00
commit 36c0acaedd
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/vc/vc-dispatcher.el
View file

@ -604,11 +604,20 @@ NOT-URGENT means it is ok to continue if the user says not to save."
(or (log-edit-empty-buffer-p)
(and (local-variable-p 'vc-log-fileset)
(not (equal vc-log-fileset fileset))))
`((log-edit-listfun . (lambda ()
;; FIXME: Should expand the list
;; for directories.
(mapcar 'file-relative-name
',fileset)))
`((log-edit-listfun
. (lambda ()
;; FIXME: Should expand the list for directories.
;; Is the above still relevant? If so, it needs a
;; better explanation. -- dgutov
(let ((root (vc-root-dir)))
;; Returns paths relative to the root, so that
;; `log-edit-changelog-insert-entries'
;; substitutes them in correctly later, even when
;; `vc-checkin' was called from a file buffer, or
;; a non-root VC-Dir buffer.
(mapcar
(lambda (file) (file-relative-name file root))
',fileset))))
(log-edit-diff-function . vc-diff)
(log-edit-vc-backend . ,backend)
(vc-log-fileset . ,fileset))