diff options
| author | Miles Bader <miles@gnu.org> | 2006-05-02 05:51:52 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-05-02 05:51:52 +0000 |
| commit | fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a (patch) | |
| tree | 2a89d2d9ea2689cfe80a7618885cdd9f449761dd /lisp/help-mode.el | |
| parent | 7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee (diff) | |
| parent | 6cf93749317c2e18f850cd0f47f905895e850bfc (diff) | |
| download | emacs-fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 239-258)
- Update from CVS
- (Ffield_beginning, find_field): Undo change of 2006-04-23.
- Rcirc patch from Ryan Yeske
- Merge from gnus--rel--5.10
- Clean up lisp/gnus/ChangeLog a bit
* gnus--rel--5.10 (patch 91-98)
- Merge from emacs--devo--0
- Update from CVS
Diffstat (limited to 'lisp/help-mode.el')
| -rw-r--r-- | lisp/help-mode.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/help-mode.el b/lisp/help-mode.el index a5cdf1f4d72..0c6e0f47453 100644 --- 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 |