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

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))