[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111392: Don't run view-mode-hook twi
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111392: Don't run view-mode-hook twice when calling view-mode (Bug#13315). |
Date: |
Tue, 01 Jan 2013 12:02:14 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111392
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2013-01-01 12:02:14 +0100
message:
Don't run view-mode-hook twice when calling view-mode (Bug#13315).
* view.el (view-mode-enable): New argument run-view-mode-hook.
Run view-mode-hook only when it's non-nil (Bug#13315).
(view-mode-enter): Call view-mode-enable with run-view-mode-hook
argument t.
modified:
lisp/ChangeLog
lisp/view.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-12-31 15:29:23 +0000
+++ b/lisp/ChangeLog 2013-01-01 11:02:14 +0000
@@ -1,3 +1,10 @@
+2013-01-01 Martin Rudalics <address@hidden>
+
+ * view.el (view-mode-enable): New argument run-view-mode-hook.
+ Run view-mode-hook only when it's non-nil (Bug#13315).
+ (view-mode-enter): Call view-mode-enable with run-view-mode-hook
+ argument t.
+
2012-12-31 Jürgen Hötzel <address@hidden>
* net/tramp-adb.el (tramp-adb-maybe-open-connection): Handle errors
=== modified file 'lisp/view.el'
--- a/lisp/view.el 2012-09-25 04:13:02 +0000
+++ b/lisp/view.el 2013-01-01 11:02:14 +0000
@@ -463,8 +463,9 @@
:lighter " View" :keymap view-mode-map
(if view-mode (view-mode-enable) (view-mode-disable)))
-(defun view-mode-enable ()
- "Turn on View mode."
+(defun view-mode-enable (&optional run-view-mode-hook)
+ "Turn on View mode.
+Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil."
;; Always leave view mode before changing major mode.
;; This is to guarantee that the buffer-read-only variable is restored.
(add-hook 'change-major-mode-hook 'view-mode-disable nil t)
@@ -482,7 +483,8 @@
(file-name-nondirectory (buffer-file-name))
(buffer-name)))))
(force-mode-line-update)
- (run-hooks 'view-mode-hook))
+ (when run-view-mode-hook
+ (run-hooks 'view-mode-hook)))
(defun view-mode-disable ()
"Turn off View mode."
@@ -560,7 +562,7 @@
(setq view-exit-action exit-action))
(unless view-mode
- (view-mode-enable)
+ (view-mode-enable t)
(force-mode-line-update)
(unless view-inhibit-help-message
(message "%s"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111392: Don't run view-mode-hook twice when calling view-mode (Bug#13315).,
martin rudalics <=