1 files changed, 18 insertions, 19 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 5c664d58f1a..e2a490092b5 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -636,23 +636,23 @@ NOT-URGENT means it is ok to continue if the user says not to save."
 		(and (local-variable-p 'vc-log-fileset)
 		     (not (equal vc-log-fileset fileset))))
 	    `((log-edit-listfun
-               . (lambda ()
-                   ;; FIXME: When fileset includes directories, and
-                   ;; there are relevant ChangeLog files inside their
-                   ;; children, we don't find them.  Either handle it
-                   ;; in `log-edit-insert-changelog-entries' by
-                   ;; walking down the file trees, or somehow pass
-                   ;; `fileset-only-files' from `vc-next-action'
-                   ;; through to this function.
-                   (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))))
+               . ,(lambda ()
+                    ;; FIXME: When fileset includes directories, and
+                    ;; there are relevant ChangeLog files inside their
+                    ;; children, we don't find them.  Either handle it
+                    ;; in `log-edit-insert-changelog-entries' by
+                    ;; walking down the file trees, or somehow pass
+                    ;; `fileset-only-files' from `vc-next-action'
+                    ;; through to this function.
+                    (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))
@@ -761,8 +761,7 @@ the buffer contents as a comment."
 ;;     (while (and (not member) fileset)
 ;;       (let ((elem (pop fileset)))
 ;;         (if (if (file-directory-p elem)
-;;                 (eq t (compare-strings buffer-file-name nil (length elem)
-;;                                        elem nil nil))
+;;                 (string-prefix-p elem buffer-file-name)
 ;;               (eq (current-buffer) (get-file-buffer elem)))
 ;;             (setq member t))))
 ;;     member))