From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 19 Nov 2014 16:11:05 +0000 (+0200)
Subject: Fix bug #19101 with log-view-mode set in the wrong buffer.
X-Git-Tag: emacs-25.0.90~2635^2~416
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e9917c08dce94e0ff92b0b202c9f5a4dd3231d22;p=emacs.git

Fix bug #19101 with log-view-mode set in the wrong buffer.

 lisp/vc/vc.el (vc-log-internal-common): Turn on log-view-mode in the
 correct buffer.  (Bug#19101)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ef3b3be71..0d1e9860ae1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* vc/vc.el (vc-log-internal-common): Turn on log-view-mode in the
+	correct buffer.  (Bug#19101)
+
 2014-11-19  Rüdiger Sonderfeld  <ruediger@c-plusplus.net>
 
 	Fix bug#19099.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b2cb4470da1..083849101d2 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2273,17 +2273,18 @@ earlier revisions.  Show up to LIMIT entries (non-nil means unlimited)."
     (with-current-buffer (get-buffer-create buffer-name)
       (set (make-local-variable 'vc-log-view-type) type))
     (setq retval (funcall backend-func backend buffer-name type files))
-    (let ((inhibit-read-only t))
-      ;; log-view-mode used to be called with inhibit-read-only bound
-      ;; to t, so let's keep doing it, just in case.
-      (vc-call-backend backend 'log-view-mode)
-      (set (make-local-variable 'log-view-vc-backend) backend)
-      (set (make-local-variable 'log-view-vc-fileset) files)
-      (set (make-local-variable 'revert-buffer-function)
-	   rev-buff-func))
+    (with-current-buffer (get-buffer buffer-name)
+      (let ((inhibit-read-only t))
+	;; log-view-mode used to be called with inhibit-read-only bound
+	;; to t, so let's keep doing it, just in case.
+	(vc-call-backend backend 'log-view-mode)
+	(set (make-local-variable 'log-view-vc-backend) backend)
+	(set (make-local-variable 'log-view-vc-fileset) files)
+	(set (make-local-variable 'revert-buffer-function)
+	     rev-buff-func)))
     ;; Display after setting up major-mode, so display-buffer-alist can know
     ;; the major-mode.
-    (pop-to-buffer buffer-name)         
+    (pop-to-buffer buffer-name)
     (vc-run-delayed
      (let ((inhibit-read-only t))
        (funcall setup-buttons-func backend files retval)