diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/facemenu.el | 13 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 8 | ||||
| -rw-r--r-- | lisp/toolbar/tool-bar.el | 7 |
4 files changed, 10 insertions, 25 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 517a2a69665..2f1eed421c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2002-02-19 Per Abrahamsen <abraham@dina.kvl.dk> + + * facemenu.el (describe-text-mode-map): Removed bootstrap kludge. + + * toolbar/tool-bar.el (tool-bar-mode): Made the standard value t. + * menu-bar.el (menu-bar-mode): Ditto. + 2002-02-18 Andreas Schwab <schwab@suse.de> * replace.el (query-replace-regexp-eval): Doc fix. diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 59e27e2dbd5..2e1e6c7538b 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -478,18 +478,7 @@ These special properties include `invisible', `intangible' and `read-only'." (defvar describe-text-mode-map (let ((map (make-sparse-keymap))) - (if (boundp 'widget-keymap) - (set-keymap-parent map widget-keymap) - ;; Copy from wid-edit.el if widget-keymap isn't in loaddefs.el - ;; Needed for bootstrap purposes, can hopefully be removed when - ;; loaddefs.el is updated. - ;; -- Per Abrahamsen <abraham@dina.kvl.dk>, 2002-02-14. - (define-key map "\t" 'widget-forward) - (define-key map [(shift tab)] 'widget-backward) - (define-key map [backtab] 'widget-backward) - (define-key map [down-mouse-2] 'widget-button-click) - (define-key map "\C-m" 'widget-button-press)) - (define-key map "q" 'describe-text-done) + (set-keymap-parent map widget-keymap) map) "Keymap for `describe-text-mode'.") diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index e6814a4e76c..2e085759eab 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1438,7 +1438,7 @@ key (or menu-item)")) (list 'menu-item "Enter" 'exit-minibuffer :help "Terminate input and exit minibuffer"))) -(defcustom menu-bar-mode nil +(defcustom menu-bar-mode t "Toggle display of a menu bar on each frame. Setting this variable directly does not take effect; use either \\[customize] or the function `menu-bar-mode'." @@ -1448,12 +1448,6 @@ use either \\[customize] or the function `menu-bar-mode'." :type 'boolean :group 'frames) -;;; `menu-bar-mode' doesn't really have a standard value, as it depend -;;; on where and how Emacs was started. By removing the standard -;;; value, we ensure that customize will always save it. -;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11. -(put 'menu-bar-mode 'standard-value nil) - (defun menu-bar-mode (&optional flag) "Toggle display of a menu bar on each frame. This command applies to all frames that exist and frames to be diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el index 3d2ded136f5..5f563be810a 100644 --- a/lisp/toolbar/tool-bar.el +++ b/lisp/toolbar/tool-bar.el @@ -47,6 +47,7 @@ With numeric ARG, display the tool bar if and only if ARG is positive. See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for conveniently adding tool bar items." + :init-value t :global t :group 'mouse :group 'frames @@ -67,12 +68,6 @@ conveniently adding tool bar items." (= 1 (length (default-value 'tool-bar-map)))) ; not yet setup (tool-bar-setup)))) -;;; `tool-bar-mode' doesn't really have a standard value, as it depend -;;; on where and how Emacs was started. By removing the standard -;;; value, we ensure that customize will always save it. -;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11. -(put 'tool-bar-mode 'standard-value nil) - (defvar tool-bar-map (make-sparse-keymap) "Keymap for the tool bar. Define this locally to override the global tool bar.") |