[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ehelp.el,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ehelp.el,v |
Date: |
Thu, 20 Nov 2008 16:57:34 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 08/11/20 16:57:33
Index: ehelp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ehelp.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ehelp.el 6 May 2008 07:57:33 -0000 1.47
+++ ehelp.el 20 Nov 2008 16:57:32 -0000 1.48
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ehelp.el,v,
Juanma Barranquero <=