[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 01/01: Fix bug #19101 with log-view-mode set in the
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 01/01: Fix bug #19101 with log-view-mode set in the wrong buffer. |
Date: |
Wed, 19 Nov 2014 16:12:04 +0000 |
branch: master
commit e9917c08dce94e0ff92b0b202c9f5a4dd3231d22
Author: Eli Zaretskii <address@hidden>
Date: Wed Nov 19 18:11:05 2014 +0200
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)
---
lisp/ChangeLog | 5 +++++
lisp/vc/vc.el | 19 ++++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ef3b3..0d1e986 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-19 Eli Zaretskii <address@hidden>
+
+ * vc/vc.el (vc-log-internal-common): Turn on log-view-mode in the
+ correct buffer. (Bug#19101)
+
2014-11-19 RĂ¼diger Sonderfeld <address@hidden>
Fix bug#19099.
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b2cb447..0838491 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 01/01: Fix bug #19101 with log-view-mode set in the wrong buffer.,
Eli Zaretskii <=