diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-06-13 15:14:42 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-06-13 15:14:42 +0200 |
| commit | 357f93d245344725f9d7c5b96eadc400107923b6 (patch) | |
| tree | 635172dd3c214f5a6933d453047f877a0379e12f /lisp/help-mode.el | |
| parent | 9481c00201c52494d5119cecd4c267bfd0c5d19e (diff) | |
| download | emacs-357f93d245344725f9d7c5b96eadc400107923b6.tar.gz | |
Make help and view-mode work with new buffer display facilities.
* help.el (help-window): Remove variable.
(help-window-point-marker, temp-buffer-max-height)
(temp-buffer-resize-mode, help-window-select): Rewrite doc-strings.
(help-print-return-message): Don't set help-window.
(resize-temp-buffer-window): Rewrite cod eand doc-string.
(help-window-setup-finish): Remove.
(help-window-display-message, help-window-setup)
(with-help-window): Major rewrite based on new
display-buffer-window variable.
* help-mode.el (help-mode-finish): Remove help-window related
code.
* view.el (view-exits-all-viewing-windows): Remove reference to
view-return-to-alist in doc-string.
(view-return-to-alist): Make obsolete.
(view-buffer): Call pop-to-buffer-same-window and remove
undo-window code.
(view-buffer-other-window): Call pop-to-buffer-other-window and
simplify code. Ignore second argument.
(view-buffer-other-frame): Call pop-to-buffer-other-frame and
simplify code. Ignore second argument.
(view-return-to-alist-update): Make obsolete.
(view-mode-enter): Rename second argument to QUIT-RESTORE.
Rewrite using quit-restore window parameters.
(view-mode-exit): Rename second argument to EXIT-ONLY. Rewrite
using quit-restore-window.
(View-exit, View-exit-and-edit, View-leave, View-quit)
(View-quit-all, View-kill-and-leave): Call view-mode-exit with
appropriate arguments.
(view-end-message): Use quit-restore window parameter.
Diffstat (limited to 'lisp/help-mode.el')
| -rw-r--r-- | lisp/help-mode.el | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 642dac71ba6..1a96f29c4cc 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -305,23 +305,6 @@ Commands: ;;;###autoload (defun help-mode-finish () - (if (eq help-window t) - ;; If `help-window' is t, `view-return-to-alist' is handled by - ;; `with-help-window'. In this case set `help-window' to the - ;; selected window since now is the only moment where we can - ;; unambiguously identify it. - (setq help-window (selected-window)) - (let ((entry (assq (selected-window) view-return-to-alist))) - (if entry - ;; When entering Help mode from the Help window, - ;; such as by following a link, preserve the same - ;; meaning for the q command. - ;; (setcdr entry (cons (selected-window) help-return-method)) - nil - (setq view-return-to-alist - (cons (cons (selected-window) help-return-method) - view-return-to-alist))))) - (when (eq major-mode 'help-mode) ;; View mode's read-only status of existing *Help* buffer is lost ;; by with-output-to-temp-buffer. |