vc-setup-buffer: Kill local file-local-variables-alist too

* lisp/vc/vc-dispatcher.el (vc-setup-buffer): Kill
file-local-variables-alist variable, too (bug#44698).
* lisp/vc/vc.el (vc-log-internal-common): Don't call
kill-all-local-variables here, that's vc-setup-buffer's job.

(cherry picked from commit e09a80143d5952b1d1d1ade2b0f2e217835e917d)

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 701936e54856def967e679be590b233e1fedafef..38782d8a5839de5a599863752011d9c66304ed55 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -186,6 +186,9 @@ Another is that undo information is not kept."
       ;; want any of its output to appear from now on.
       (when oldproc (delete-process oldproc)))
     (kill-all-local-variables)
+    ;; Kill also this permanent local var in case the VC command that
+    ;; created BUF was invoked from a different directory (bug#44698).
+    (kill-local-variable 'file-local-variables-alist)
     (setq-local vc-parent-buffer camefrom)
     (setq-local vc-parent-buffer-name
                 (concat " from " (buffer-name camefrom)))

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 7479702df7ed572855b89b69c5d712c9e2043fb7..a2bd24a20427a64b324f83667990e6cd5ac87f98 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2988,9 +2988,6 @@ Each function runs in the log output buffer without args.")
                               rev-buff-func)
   (let (retval (buffer (get-buffer-create buffer-name)))
     (with-current-buffer buffer
-      ;; Ensure we drop any directory-local variables from the last
-      ;; directory from which a log buffer was generated (bug#44698).
-      (kill-all-local-variables 'kill-permanent)
       (setq-local vc-log-view-type type))
     (setq retval (funcall backend-func backend buffer-name type files))
     (with-current-buffer buffer