(help-mode): view-exit-action calls delete-window

only when it is safe and possible.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d06ffdb2977ffa96908f10aae8eb77c4037d367d..ae61defbea26ead27640f419896e197c2289d8c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-01  Richard Stallman  <rms@gnu.org>
+
+       * help-mode.el (help-mode): view-exit-action calls delete-window
+       only when it is safe and possible.
+
+       * simple.el (undo-outer-limit-truncate): Put quotes around buffer name
+       in messages.
+
+       * emacs-lisp/warnings.el (display-warning, lwarn): Doc fixes.
+
+       * tool-bar.el (tool-bar-setup): Put Help and Preferences items
+       in the default tool-bar-map.
+
 2006-05-01  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-completion-file-name-handler-alist)
@@ -16,7 +29,7 @@
        2006-04-28.
        (tramp-register-file-name-handlers): Register
        `tramp-completion-file-name-handler' only when
-       `partial-completion-mode´ is enabled.
+       `partial-completion-mode is enabled.
        (tramp-completion-handle-file-name-all-completions): Delete
        directory part from results.
        (tramp-get-completion-methods, tramp-get-completion-user-host):

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index a5cdf1f4d720e37cf26903c352de7cef3f599bb8..0c6e0f47453b94f2eae83650bc52d835eb710e49 100644 (file)
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -197,7 +197,10 @@ Commands:
   (view-mode)
   (make-local-variable 'view-no-disable-on-exit)
   (setq view-no-disable-on-exit t)
-  (setq view-exit-action (lambda (buffer) (delete-window)))
+  (setq view-exit-action (lambda (buffer)
+                          (or (window-minibuffer-p (selected-window))
+                              (one-window-p t)
+                              (delete-window))))
   (run-mode-hooks 'help-mode-hook))
 
 ;;;###autoload