aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-02-20 19:22:43 +0000
committerEli Zaretskii2001-02-20 19:22:43 +0000
commitf55e4a7eb6e6db75696c5e628670af03f29ac5a9 (patch)
tree19830931e8ab5444329319d8224d5c5f1e3807e3
parentd17e49a898f97e894fc9793b2d6678e0e104e191 (diff)
downloademacs-f55e4a7eb6e6db75696c5e628670af03f29ac5a9.tar.gz
emacs-f55e4a7eb6e6db75696c5e628670af03f29ac5a9.zip
(with-electric-help): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ehelp.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9ad081d554..0834dbed9a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12001-02-20 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * ehelp.el (with-electric-help): Doc fix.
4
12001-02-20 Gerd Moellmann <gerd@gnu.org> 52001-02-20 Gerd Moellmann <gerd@gnu.org>
2 6
3 * msb.el (msb-mode): Call the update-buffers function explicitly 7 * msb.el (msb-mode): Call the update-buffers function explicitly
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 9bb48b1bbd2..4fe8b37d4db 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -126,8 +126,8 @@ If THUNK returns nil, we display BUFFER starting at the top, and
126shrink the window to fit if `electric-help-shrink-window' is non-nil. 126shrink the window to fit if `electric-help-shrink-window' is non-nil.
127If THUNK returns non-nil, we don't do those things. 127If THUNK returns non-nil, we don't do those things.
128 128
129When the user exits (with `electric-help-exit', or otherwise) the help 129When the user exits (with `electric-help-exit', or otherwise), the help
130buffer's window disappears (i.e., we use `save-window-excursion') 130buffer's window disappears (i.e., we use `save-window-excursion'), and
131BUFFER is put into `default-major-mode' (or `fundamental-mode') when we exit." 131BUFFER is put into `default-major-mode' (or `fundamental-mode') when we exit."
132 (setq buffer (get-buffer-create (or buffer "*Help*"))) 132 (setq buffer (get-buffer-create (or buffer "*Help*")))
133 (let ((one (one-window-p t)) 133 (let ((one (one-window-p t))
@@ -170,7 +170,7 @@ BUFFER is put into `default-major-mode' (or `fundamental-mode') when we exit."
170 170
171 ;; We should really get a usable *Help* buffer when retaining 171 ;; We should really get a usable *Help* buffer when retaining
172 ;; the electric one with `r'. The problem is that a simple 172 ;; the electric one with `r'. The problem is that a simple
173 ;; call to help-mode won't cut it; at least RET is vound wrong 173 ;; call to help-mode won't cut it; at least RET is bound wrong
174 ;; afterwards. It's also not clear that `help-mode' is always 174 ;; afterwards. It's also not clear that `help-mode' is always
175 ;; the right thing, maybe we should add an optional parameter. 175 ;; the right thing, maybe we should add an optional parameter.
176 (condition-case () 176 (condition-case ()
@@ -179,7 +179,7 @@ BUFFER is put into `default-major-mode' (or `fundamental-mode') when we exit."
179 179
180 (set-window-configuration config) 180 (set-window-configuration config)
181 (when bury 181 (when bury
182 ;;>> Perhaps this shouldn't be done. 182 ;;>> Perhaps this shouldn't be done,
183 ;; so that when we say "Press space to bury" we mean it 183 ;; so that when we say "Press space to bury" we mean it
184 (replace-buffer-in-windows buffer) 184 (replace-buffer-in-windows buffer)
185 ;; must do this outside of save-window-excursion 185 ;; must do this outside of save-window-excursion