[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 36c0aca 2/2: Merge branch 'master' of git.sv.gnu.or
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] master 36c0aca 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Fri, 10 Apr 2015 01:06:56 +0000 |
branch: master
commit 36c0acaedd5f4646276e4edd7cb94248473d075a
Merge: e368697 0679159
Author: Jay Belanger <address@hidden>
Commit: Jay Belanger <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
lisp/vc/vc-dispatcher.el | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 4f8ec27..8b3e888 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 36c0aca 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Jay Belanger <=