aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2005-11-29 10:53:30 +0000
committerRomain Francoise2005-11-29 10:53:30 +0000
commit1c0484e2a2cdd089d16eeadfd057f08ccbb2308d (patch)
tree33243bcddbc49fbefafa00a364a5339494131159
parent59f1b05814c0e8cad89a81747e6fa2085f434867 (diff)
downloademacs-1c0484e2a2cdd089d16eeadfd057f08ccbb2308d.tar.gz
emacs-1c0484e2a2cdd089d16eeadfd057f08ccbb2308d.zip
(view-inhibit-help-message): New defcustom.
(view-mode-enter): Use it.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/view.el13
2 files changed, 17 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a108e294634..3511a86f9f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,13 @@
12005-11-29 Romain Francoise <romain@orebokech.com>
2
3 * view.el (view-inhibit-help-message): New defcustom.
4 (view-mode-enter): Use it.
5
12005-11-29 Michael Kifer <kifer@cs.stonybrook.edu> 62005-11-29 Michael Kifer <kifer@cs.stonybrook.edu>
2 7
3 * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display): 8 * ediff-wind (ediff-setup-control-frame, ediff-make-wide-display):
4 preserve user position. 9 preserve user position.
5 10
62005-11-28 Luc Teirlinck <teirllm@auburn.edu> 112005-11-28 Luc Teirlinck <teirllm@auburn.edu>
7 12
8 * font-lock.el: Throw error if facemenu is not loaded to prevent 13 * font-lock.el: Throw error if facemenu is not loaded to prevent
diff --git a/lisp/view.el b/lisp/view.el
index 0d6b941a0ca..4cbc0fe9e4c 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -93,6 +93,12 @@ considered for restoring."
93 :type 'boolean 93 :type 'boolean
94 :group 'view) 94 :group 'view)
95 95
96(defcustom view-inhibit-help-message nil
97 "*Non-nil inhibits the help message showed upon entering View mode."
98 :type 'boolean
99 :group 'view
100 :version "22.1")
101
96;;;###autoload 102;;;###autoload
97(defvar view-mode nil 103(defvar view-mode nil
98 "Non-nil if View mode is enabled. 104 "Non-nil if View mode is enabled.
@@ -516,9 +522,10 @@ This function runs the normal hook `view-mode-hook'."
516 (unless view-mode ; Do nothing if already in view mode. 522 (unless view-mode ; Do nothing if already in view mode.
517 (view-mode-enable) 523 (view-mode-enable)
518 (force-mode-line-update) 524 (force-mode-line-update)
519 (message "%s" 525 (unless view-inhibit-help-message
520 (substitute-command-keys "\ 526 (message "%s"
521View mode: type \\[help-command] for help, \\[describe-mode] for commands, \\[View-quit] to quit.")))) 527 (substitute-command-keys "\
528View mode: type \\[help-command] for help, \\[describe-mode] for commands, \\[View-quit] to quit.")))))
522 529
523(defun view-mode-exit (&optional return-to-alist exit-action all-win) 530(defun view-mode-exit (&optional return-to-alist exit-action all-win)
524 "Exit View mode in various ways, depending on optional arguments. 531 "Exit View mode in various ways, depending on optional arguments.