Mercurial > emacs
changeset 99750:f5057049058b
* ehelp.el (electric-help-map, ehelp-map): Define within defvar.
(with-electric-help): Fix typo and reflow docstring.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 20 Nov 2008 16:57:30 +0000 |
| parents | b491431b74c8 |
| children | 5482506bbfd1 |
| files | lisp/ChangeLog lisp/ehelp.el |
| diffstat | 2 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 20 15:35:30 2008 +0000 +++ b/lisp/ChangeLog Thu Nov 20 16:57:30 2008 +0000 @@ -1,3 +1,8 @@ +2008-11-20 Juanma Barranquero <lekktu@gmail.com> + + * ehelp.el (electric-help-map, ehelp-map): Define within defvar. + (with-electric-help): Fix typo and reflow docstring. + 2008-11-20 Stefan Monnier <monnier@iro.umontreal.ca> * buff-menu.el (Buffer-menu-short-ellipsis): New constant.
--- a/lisp/ehelp.el Thu Nov 20 15:35:30 2008 +0000 +++ b/lisp/ehelp.el Thu Nov 20 16:57:30 2008 +0000 @@ -38,8 +38,6 @@ ;;; Code: (require 'electric) -(defvar electric-help-map () - "Keymap defining commands available in `electric-help-mode'.") (defvar electric-help-form-to-execute nil) @@ -59,8 +57,8 @@ :group 'electric-help) (put 'electric-help-undefined 'suppress-keymap t) -(if electric-help-map - () + +(defvar electric-help-map (let ((map (make-keymap))) ;; allow all non-self-inserting keys - search, scroll, etc, but ;; let M-x and C-x exit ehelp mode and retain buffer: @@ -91,8 +89,8 @@ (define-key map "r" 'electric-help-retain) (define-key map "\ex" 'electric-help-execute-extended) (define-key map "\C-x" 'electric-help-ctrl-x-prefix) - - (setq electric-help-map map))) + map) + "Keymap defining commands available in `electric-help-mode'.") (defun electric-help-mode () "`with-electric-help' temporarily places its buffer in this mode. @@ -117,13 +115,13 @@ be called while BUFFER is current and with `standard-output' bound to the buffer specified by BUFFER. -If THUNK returns nil, we display BUFFER starting at the top, and -shrink the window to fit. If THUNK returns non-nil, we don't do those things. +If THUNK returns nil, we display BUFFER starting at the top, and shrink +the window to fit. If THUNK returns non-nil, we don't do those things. -After THUNK has been called, this function \"electrically\" pops up a window -in which BUFFER is displayed and allows the user to scroll through that buffer -in `electric-help-mode'. The window's height will be at least MINHEIGHT if -this value is non-nil. +After THUNK has been called, this function \"electrically\" pops up a +window in which BUFFER is displayed and allows the user to scroll +through that buffer in `electric-help-mode'. The window's height will +be at least MINHEIGHT if this value is non-nil. If THUNK returns nil, we display BUFFER starting at the top, and shrink the window to fit if `electric-help-shrink-window' is non-nil. @@ -402,9 +400,7 @@ ;;;; ehelp-map -(defvar ehelp-map ()) -(if ehelp-map - nil +(defvar ehelp-map (let ((map (copy-keymap help-map))) (substitute-key-definition 'apropos 'electric-apropos map) (substitute-key-definition 'command-apropos 'electric-command-apropos map) @@ -415,8 +411,7 @@ (substitute-key-definition 'describe-variable 'electric-describe-variable map) (substitute-key-definition 'describe-bindings 'electric-describe-bindings map) (substitute-key-definition 'describe-syntax 'electric-describe-syntax map) - - (setq ehelp-map map))) + map)) ;;;###(autoload 'ehelp-command "ehelp" "Prefix command for ehelp." t 'keymap) (defalias 'ehelp-command ehelp-map)