diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-04-10 03:54:55 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-04-10 03:54:55 +0300 |
| commit | 0679159c41a0c577cadf6b08f730e00f3c00931c (patch) | |
| tree | 94e76993fca669e3fdc36cc9dd433cfb8f8e9dee | |
| parent | c1daad42c643d71fa022b35512457c9e4fbb8b6d (diff) | |
| download | emacs-0679159c41a0c577cadf6b08f730e00f3c00931c.tar.gz emacs-0679159c41a0c577cadf6b08f730e00f3c00931c.tar.bz2 emacs-0679159c41a0c577cadf6b08f730e00f3c00931c.zip | |
Use the VC root in `log-edit-listfun'
* lisp/vc/vc-dispatcher.el (vc-log-edit): Use the VC root in
`log-edit-listfun'.
| -rw-r--r-- | 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 4f8ec278896..8b3e888f700 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)) |