Commit 3fd29551 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

* ehelp.el (electric-help-map, ehelp-map): Define within defvar.

  (with-electric-help): Fix typo and reflow docstring.
parent 31e02fab
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> 2008-11-20 Stefan Monnier <monnier@iro.umontreal.ca>
   
* buff-menu.el (Buffer-menu-short-ellipsis): New constant. * buff-menu.el (Buffer-menu-short-ellipsis): New constant.
......
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
;;; Code: ;;; Code:
(require 'electric) (require 'electric)
(defvar electric-help-map ()
"Keymap defining commands available in `electric-help-mode'.")
(defvar electric-help-form-to-execute nil) (defvar electric-help-form-to-execute nil)
...@@ -59,8 +57,8 @@ ...@@ -59,8 +57,8 @@
:group 'electric-help) :group 'electric-help)
(put 'electric-help-undefined 'suppress-keymap t) (put 'electric-help-undefined 'suppress-keymap t)
(if electric-help-map
() (defvar electric-help-map
(let ((map (make-keymap))) (let ((map (make-keymap)))
;; allow all non-self-inserting keys - search, scroll, etc, but ;; allow all non-self-inserting keys - search, scroll, etc, but
;; let M-x and C-x exit ehelp mode and retain buffer: ;; let M-x and C-x exit ehelp mode and retain buffer:
...@@ -91,8 +89,8 @@ ...@@ -91,8 +89,8 @@
(define-key map "r" 'electric-help-retain) (define-key map "r" 'electric-help-retain)
(define-key map "\ex" 'electric-help-execute-extended) (define-key map "\ex" 'electric-help-execute-extended)
(define-key map "\C-x" 'electric-help-ctrl-x-prefix) (define-key map "\C-x" 'electric-help-ctrl-x-prefix)
map)
(setq electric-help-map map))) "Keymap defining commands available in `electric-help-mode'.")
(defun electric-help-mode () (defun electric-help-mode ()
"`with-electric-help' temporarily places its buffer in this mode. "`with-electric-help' temporarily places its buffer in this mode.
...@@ -117,13 +115,13 @@ erased before THUNK is called unless NOERASE is non-nil. THUNK will ...@@ -117,13 +115,13 @@ erased before THUNK is called unless NOERASE is non-nil. THUNK will
be called while BUFFER is current and with `standard-output' bound to be called while BUFFER is current and with `standard-output' bound to
the buffer specified by BUFFER. the buffer specified by BUFFER.
If THUNK returns nil, we display BUFFER starting at the top, and If THUNK returns nil, we display BUFFER starting at the top, and shrink
shrink the window to fit. If THUNK returns non-nil, we don't do those things. 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 After THUNK has been called, this function \"electrically\" pops up a
in which BUFFER is displayed and allows the user to scroll through that buffer window in which BUFFER is displayed and allows the user to scroll
in `electric-help-mode'. The window's height will be at least MINHEIGHT if through that buffer in `electric-help-mode'. The window's height will
this value is non-nil. be at least MINHEIGHT if this value is non-nil.
If THUNK returns nil, we display BUFFER starting at the top, and 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. shrink the window to fit if `electric-help-shrink-window' is non-nil.
...@@ -402,9 +400,7 @@ will select it.)" ...@@ -402,9 +400,7 @@ will select it.)"
;;;; ehelp-map ;;;; ehelp-map
(defvar ehelp-map ()) (defvar ehelp-map
(if ehelp-map
nil
(let ((map (copy-keymap help-map))) (let ((map (copy-keymap help-map)))
(substitute-key-definition 'apropos 'electric-apropos map) (substitute-key-definition 'apropos 'electric-apropos map)
(substitute-key-definition 'command-apropos 'electric-command-apropos map) (substitute-key-definition 'command-apropos 'electric-command-apropos map)
...@@ -415,8 +411,7 @@ will select it.)" ...@@ -415,8 +411,7 @@ will select it.)"
(substitute-key-definition 'describe-variable 'electric-describe-variable map) (substitute-key-definition 'describe-variable 'electric-describe-variable map)
(substitute-key-definition 'describe-bindings 'electric-describe-bindings map) (substitute-key-definition 'describe-bindings 'electric-describe-bindings map)
(substitute-key-definition 'describe-syntax 'electric-describe-syntax map) (substitute-key-definition 'describe-syntax 'electric-describe-syntax map)
map))
(setq ehelp-map map)))
;;;###(autoload 'ehelp-command "ehelp" "Prefix command for ehelp." t 'keymap) ;;;###(autoload 'ehelp-command "ehelp" "Prefix command for ehelp." t 'keymap)
(defalias 'ehelp-command ehelp-map) (defalias 'ehelp-command ehelp-map)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment