Commit 3c3a05df authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents a690a978 d647b7c4
2011-06-13 Glenn Morris <rgm@gnu.org>
* cus-dep.el (custom-make-dependencies): Use up command-line-args-left.
2011-06-13 Martin Rudalics <rudalics@gmx.at>
* 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.
* window.el (display-buffer-function): Rewrite doc-string.
(display-buffer-window, display-buffer-alist): New variables.
(display-buffer-split-specifiers)
(display-buffer-side-specifiers)
(display-buffer-macro-specifiers): New constants.
(display-buffer-even-window-sizes, display-buffer-set-height)
(display-buffer-set-width, display-buffer-select-window)
(display-buffer-in-window, display-buffer-reuse-window)
(display-buffer-split-window-1, display-buffer-split-window)
(display-buffer-split-atom-window, display-buffer-pop-up-window)
(display-buffer-pop-up-frame, display-buffer-pop-up-side-window)
(display-buffer-in-side-window, normalize-buffer-to-display)
(display-buffer-normalize-specifiers-1)
(display-buffer-normalize-specifiers-2)
(display-buffer-normalize-specifiers, display-buffer-frame): New
functions.
(display-buffer): Major rewrite.
(display-buffer-other-window, display-buffer-other-frame)
(pop-to-buffer, switch-to-buffer-other-window)
(switch-to-buffer-other-frame): Rewrite.
(display-buffer-same-window, display-buffer-same-frame)
(display-buffer-same-frame-other-window)
(pop-to-buffer-same-window, pop-to-buffer-same-frame)
(pop-to-buffer-other-window)
(pop-to-buffer-same-frame-other-window)
(pop-to-buffer-other-frame, switch-to-buffer-same-frame)
(switch-to-buffer-other-window-same-frame): New functions.
(same-window-p, special-display-p): Rewrite disabling warnings.
Make obsolete.
(pop-up-frames, display-buffer-reuse-frames, pop-up-windows)
(display-buffer-mark-dedicated): Initialize to symbol 'unset.
Make obsolete
(same-window-buffer-names, same-window-regexps)
(special-display-frame-alist, special-display-popup-frame)
(special-display-function, special-display-buffer-names)
(special-display-regexps, pop-up-frame-alist)
(pop-up-frame-function, split-window-preferred-function)
(split-height-threshold, split-width-threshold)
(even-window-heights): Make obsolete.
2011-06-12 Glenn Morris <rgm@gnu.org> 2011-06-12 Glenn Morris <rgm@gnu.org>
* term/xterm.el (terminal-init-xterm): `version' may be nil. (Bug#8838) * term/xterm.el (terminal-init-xterm): `version' may be nil. (Bug#8838)
......
...@@ -42,9 +42,12 @@ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)" ...@@ -42,9 +42,12 @@ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)"
(defun custom-make-dependencies () (defun custom-make-dependencies ()
"Batch function to extract custom dependencies from .el files. "Batch function to extract custom dependencies from .el files.
Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
(let ((enable-local-eval nil)) (let ((enable-local-eval nil)
subdir)
(with-temp-buffer (with-temp-buffer
(dolist (subdir command-line-args-left) ;; Use up command-line-args-left else Emacs can try to open
;; the args as directories after we are done.
(while (setq subdir (pop command-line-args-left))
(message "Directory %s" subdir) (message "Directory %s" subdir)
(let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'")) (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'"))
(default-directory (expand-file-name subdir)) (default-directory (expand-file-name subdir))
......
...@@ -305,23 +305,6 @@ Commands: ...@@ -305,23 +305,6 @@ Commands:
;;;###autoload ;;;###autoload
(defun help-mode-finish () (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) (when (eq major-mode 'help-mode)
;; View mode's read-only status of existing *Help* buffer is lost ;; View mode's read-only status of existing *Help* buffer is lost
;; by with-output-to-temp-buffer. ;; by with-output-to-temp-buffer.
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
;; nowhere before exiting. Currently used by `view-lossage' to assert ;; nowhere before exiting. Currently used by `view-lossage' to assert
;; that the last keystrokes are always visible. ;; that the last keystrokes are always visible.
(defvar help-window-point-marker (make-marker) (defvar help-window-point-marker (make-marker)
"Marker to override default `window-point' of `help-window'.") "Marker to override default `window-point' in help windows.")
(defvar help-map (defvar help-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
...@@ -144,8 +144,6 @@ It computes a message, and applies the optional argument FUNCTION to it. ...@@ -144,8 +144,6 @@ It computes a message, and applies the optional argument FUNCTION to it.
If FUNCTION is nil, it applies `message', thus displaying the message. If FUNCTION is nil, it applies `message', thus displaying the message.
In addition, this function sets up `help-return-method', which see, that In addition, this function sets up `help-return-method', which see, that
specifies what to do when the user exits the help buffer." specifies what to do when the user exits the help buffer."
;; Reset `help-window' here to avoid confusing `help-mode-finish'.
(setq help-window nil)
(and (not (get-buffer-window standard-output)) (and (not (get-buffer-window standard-output))
(let ((first-message (let ((first-message
(cond ((or (cond ((or
...@@ -914,6 +912,7 @@ appeared on the mode-line." ...@@ -914,6 +912,7 @@ appeared on the mode-line."
;; In order to list up all minor modes, minor-mode-list ;; In order to list up all minor modes, minor-mode-list
;; is used here instead of minor-mode-alist. ;; is used here instead of minor-mode-alist.
(delq nil (mapcar 'symbol-name minor-mode-list))) (delq nil (mapcar 'symbol-name minor-mode-list)))
(defun describe-minor-mode-from-symbol (symbol) (defun describe-minor-mode-from-symbol (symbol)
"Display documentation of a minor mode given as a symbol, SYMBOL" "Display documentation of a minor mode given as a symbol, SYMBOL"
(interactive (list (intern (completing-read (interactive (list (intern (completing-read
...@@ -937,6 +936,7 @@ appeared on the mode-line." ...@@ -937,6 +936,7 @@ appeared on the mode-line."
(t (t
i)))) i))))
minor-mode-alist))) minor-mode-alist)))
(defun describe-minor-mode-from-indicator (indicator) (defun describe-minor-mode-from-indicator (indicator)
"Display documentation of a minor mode specified by INDICATOR. "Display documentation of a minor mode specified by INDICATOR.
If you call this function interactively, you can give indicator which If you call this function interactively, you can give indicator which
...@@ -972,28 +972,32 @@ is currently activated with completion." ...@@ -972,28 +972,32 @@ is currently activated with completion."
minor-modes nil) minor-modes nil)
(setq minor-modes (cdr minor-modes))))) (setq minor-modes (cdr minor-modes)))))
result)) result))
;;; Automatic resizing of temporary buffers. ;;; Automatic resizing of temporary buffers.
(defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2)) (defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2))
"Maximum height of a window displaying a temporary buffer. "Maximum height of a window displaying a temporary buffer.
This is effective only when Temp Buffer Resize mode is enabled. This is effective only when Temp Buffer Resize mode is enabled.
The value is the maximum height (in lines) which `resize-temp-buffer-window' The value is the maximum height (in lines) which
will give to a window displaying a temporary buffer. `resize-temp-buffer-window' will give to a window displaying a
It can also be a function to be called to choose the height for such a buffer. temporary buffer. It can also be a function to be called to
It gets one argumemt, the buffer, and should return a positive integer." choose the height for such a buffer. It gets one argumemt, the
buffer, and should return a positive integer. At the time the
function is called, the window to be resized is selected."
:type '(choice integer function) :type '(choice integer function)
:group 'help :group 'help
:version "20.4") :version "20.4")
(define-minor-mode temp-buffer-resize-mode (define-minor-mode temp-buffer-resize-mode
"Toggle the mode which makes windows smaller for temporary buffers. "Toggle mode which makes windows smaller for temporary buffers.
With prefix argument ARG, turn the resizing of windows displaying temporary With prefix argument ARG, turn the resizing of windows displaying
buffers on if ARG is positive or off otherwise. temporary buffers on if ARG is positive or off otherwise.
This makes the window the right height for its contents, but never
more than `temp-buffer-max-height' nor less than `window-min-height'. This mode makes a window the right height for its contents, but
This applies to `help', `apropos' and `completion' buffers, and some others." never more than `temp-buffer-max-height' nor less than
`window-min-height'.
This mode is used by `help', `apropos' and `completion' buffers,
and some others."
:global t :group 'help :global t :group 'help
(if temp-buffer-resize-mode (if temp-buffer-resize-mode
;; `help-make-xrefs' may add a `back' button and thus increase the ;; `help-make-xrefs' may add a `back' button and thus increase the
...@@ -1003,29 +1007,26 @@ This applies to `help', `apropos' and `completion' buffers, and some others." ...@@ -1003,29 +1007,26 @@ This applies to `help', `apropos' and `completion' buffers, and some others."
(defun resize-temp-buffer-window () (defun resize-temp-buffer-window ()
"Resize the selected window to fit its contents. "Resize the selected window to fit its contents.
Will not make it higher than `temp-buffer-max-height' nor smaller than Will not make it higher than `temp-buffer-max-height' nor smaller
`window-min-height'. Do nothing if it is the only window on its frame, if it than `window-min-height'. Do nothing if the selected window is
is not as wide as the frame or if some of the window's contents are scrolled not vertically combined or some of its contents are scrolled out
out of view." of view."
(unless (or (one-window-p 'nomini) (when (and (pos-visible-in-window-p (point-min))
(not (pos-visible-in-window-p (point-min))) (window-iso-combined-p))
(not (window-full-width-p)))
(fit-window-to-buffer (fit-window-to-buffer
(selected-window) nil
(if (functionp temp-buffer-max-height) (if (functionp temp-buffer-max-height)
(funcall temp-buffer-max-height (current-buffer)) (funcall temp-buffer-max-height (window-buffer))
temp-buffer-max-height)))) temp-buffer-max-height))))
;;; Help windows.
;;; help-window
(defcustom help-window-select 'other (defcustom help-window-select 'other
"Non-nil means select help window for viewing. "Non-nil means select help window for viewing.
Choices are: Choices are:
never (nil) Select help window only if there is no other window never (nil) Select help window only if there is no other window
on its frame. on its frame.
other Select help window unless the selected window is the other Select help window unless the selected window is the
only other window on its frame. only other window on the help window's frame.
always (t) Always select the help window. always (t) Always select the help window.
This option has effect if and only if the help window was created This option has effect if and only if the help window was created
...@@ -1036,95 +1037,38 @@ by `with-help-window'" ...@@ -1036,95 +1037,38 @@ by `with-help-window'"
:group 'help :group 'help
:version "23.1") :version "23.1")
(defun help-window-display-message (quit-part window &optional other) (defun help-window-display-message (quit-part window &optional scroll)
"Display message telling how to quit and scroll help window. "Display message telling how to quit and scroll help window.
QUIT-PART is a string telling how to quit the help window WINDOW. QUIT-PART is a string telling how to quit the help window WINDOW.
Optional argument OTHER non-nil means return text telling how to Optional argument SCROLL non-nil means tell how to scroll WINDOW.
scroll the \"other\" window." SCROLL equal `other' means tell how to scroll the \"other\"
window."
(let ((scroll-part (let ((scroll-part
(cond (cond
;; If we don't have QUIT-PART we probably reuse a window
;; showing the same buffer so we don't show any message.
((not quit-part) nil)
((pos-visible-in-window-p ((pos-visible-in-window-p
(with-current-buffer (window-buffer window) (with-current-buffer (window-buffer window)
(point-max)) window) (point-max)) window t)
;; Buffer end is visible. ;; Buffer end is at least partially visible, no need to talk
;; about scrolling.
".") ".")
(other ", \\[scroll-other-window] to scroll help.") ((eq scroll 'other)
(t ", \\[scroll-up] to scroll help.")))) ", \\[scroll-other-window] to scroll help.")
(scroll ", \\[scroll-up] to scroll help."))))
(message "%s" (message "%s"
(substitute-command-keys (concat quit-part scroll-part))))) (substitute-command-keys (concat quit-part scroll-part)))))
(defun help-window-setup-finish (window &optional reuse keep-frame) (defun help-window-setup ()
"Finish setting up help window WINDOW. "Set up help window for `with-help-window'.
Select WINDOW according to the value of `help-window-select'. This relies on `display-buffer-window' being correctly set up by
Display message telling how to scroll and eventually quit WINDOW. `display-buffer'."
(let* ((help-window (car-safe display-buffer-window))
Optional argument REUSE non-nil means WINDOW has been reused by (help-buffer (when (window-live-p help-window)
`display-buffer'. Optional argument KEEP-FRAME non-nil means (window-buffer help-window)))
that quitting should not delete WINDOW's frame." (help-value (cdr-safe display-buffer-window)))
(let ((number-of-windows (when help-buffer
(length (window-list (window-frame window) 'no-mini window))))
(cond
((eq window (selected-window))
;; The help window is the selected window, probably the
;; `pop-up-windows' nil case.
(help-window-display-message
(if reuse
"Type \"q\" to restore this window"
;; This should not be taken.
"Type \"q\" to quit") window))
((= number-of-windows 1)
;; The help window is alone on a frame and not the selected
;; window, could be the `pop-up-frames' t case.
(help-window-display-message
(cond
(keep-frame "Type \"q\" to delete this window")
(reuse "Type \"q\" to restore this window")
(view-remove-frame-by-deleting "Type \"q\" to delete this frame")
(t "Type \"q\" to iconify this frame"))
window))
((and (= number-of-windows 2)
(eq (window-frame window) (window-frame (selected-window))))
;; There are two windows on the help window's frame and the other
;; window is the selected one.
(if (memq help-window-select '(nil other))
;; Do not select the help window.
(help-window-display-message
(if reuse
;; Offer `display-buffer' for consistency with
;; `help-print-return-message'. This is hardly TRT when
;; the other window and the selected window display the
;; same buffer but has been handled this way ever since.
"Type \\[display-buffer] RET to restore the other window"
;; The classic "two windows" configuration.
"Type \\[delete-other-windows] to delete the help window")
window t)
;; Select help window and tell how to quit.
(select-window window)
(help-window-display-message
(if reuse
"Type \"q\" to restore this window"
"Type \"q\" to delete this window") window)))
(help-window-select
;; Issuing a message with 3 or more windows on the same frame
;; without selecting the help window doesn't make any sense.
(select-window window)
(help-window-display-message
(if reuse
"Type \"q\" to restore this window"
"Type \"q\" to delete this window") window)))))
(defun help-window-setup (list-of-frames list-of-window-tuples)
"Set up help window.
LIST-OF-FRAMES and LIST-OF-WINDOW-TUPLES are the lists of frames
and window quadruples built by `with-help-window'. The help
window itself is specified by the variable `help-window'."
(let* ((help-buffer (window-buffer help-window))
;; `help-buffer' now denotes the help window's buffer.
(view-entry
(assq help-window
(buffer-local-value 'view-return-to-alist help-buffer)))
(help-entry (assq help-window list-of-window-tuples)))
;; Handle `help-window-point-marker'. ;; Handle `help-window-point-marker'.
(when (eq (marker-buffer help-window-point-marker) help-buffer) (when (eq (marker-buffer help-window-point-marker) help-buffer)
(set-window-point help-window help-window-point-marker) (set-window-point help-window help-window-point-marker)
...@@ -1132,79 +1076,40 @@ window itself is specified by the variable `help-window'." ...@@ -1132,79 +1076,40 @@ window itself is specified by the variable `help-window'."
(set-marker help-window-point-marker nil)) (set-marker help-window-point-marker nil))
(cond (cond
(view-entry ((or (eq help-window (selected-window))
;; `view-return-to-alist' has an entry for the help window. (and (or (eq help-window-select t)
(and (eq help-window-select 'other)
(eq (window-frame help-window) (selected-frame))
(> (length (window-list nil 'no-mini)) 2)))
(select-window help-window)))
;; The help window is or gets selected ...
(help-window-display-message
(cond (cond
((eq help-window (selected-window)) ((eq help-value 'new-window)
;; The help window is the selected window, probably because the ;; ... and is new, ...
;; user followed a backward/forward button or a cross reference. "Type \"q\" to delete this window")
;; In this case just purge stale entries from ((eq help-value 'new-frame)
;; `view-return-to-alist' but leave the entry alone and don't ;; ... is on a new frame ...
;; display a message. "Type \"q\" to delete this frame")
(view-return-to-alist-update help-buffer)) ((eq help-value 'reuse-other-window)
((and help-entry (eq (cadr help-entry) help-buffer)) ;; ... or displayed some other buffer before.
;; The help window was not selected but displayed the help "Type \"q\" to restore previous buffer"))
;; buffer. In this case reuse existing exit information but try help-window t))
;; to get back to the selected window when quitting. Don't ((and (eq (window-frame help-window) (selected-frame))
;; display a message since the user must have seen one before. (= (length (window-list nil 'no-mini)) 2))
(view-return-to-alist-update ;; There are two windows on the help window's frame and the
help-buffer (cons help-window ;; other one is the selected one.
(cons (selected-window) (cddr view-entry))))) (help-window-display-message
(help-entry (cond
;; The help window was not selected, did display the help buffer ((eq help-value 'new-window)
;; earlier, but displayed another buffer when help was invoked. "Type \\[delete-other-windows] to delete the help window")
;; Set up things so that quitting will show that buffer again. ((eq help-value 'reuse-other-window)
(view-return-to-alist-update "Type \\[switch-to-prev-buffer] RET to restore previous buffer"))
help-buffer (cons help-window help-window 'other))
(cons (selected-window) (cdr help-entry))))
(help-window-setup-finish help-window t))
(t
;; The help window is new but `view-return-to-alist' had an
;; entry for it. This should never happen.
(view-return-to-alist-update
help-buffer (cons help-window
(cons (selected-window) 'quit-window)))
(help-window-setup-finish help-window t))))
(help-entry
;; `view-return-to-alist' does not have an entry for help window
;; but `list-of-window-tuples' does. Hence `display-buffer' must
;; have reused an existing window.
(if (eq (cadr help-entry) help-buffer)
;; The help window displayed `help-buffer' before but no
;; `view-return-to-alist' entry was found probably because the
;; user manually switched to the help buffer. Set up things
;; for `quit-window' although `view-exit-action' should be
;; able to handle this case all by itself.
(progn
(view-return-to-alist-update
help-buffer (cons help-window
(cons (selected-window) 'quit-window)))
(help-window-setup-finish help-window t))
;; The help window displayed another buffer before. Set up
;; things in a way that quitting can orderly show that buffer
;; again. The window-start and window-point information from
;; `list-of-window-tuples' provide the necessary information.
(view-return-to-alist-update
help-buffer (cons help-window
(cons (selected-window) (cdr help-entry))))
(help-window-setup-finish help-window t)))
((memq (window-frame help-window) list-of-frames)
;; The help window is a new window on an existing frame. This
;; case must be handled specially by `help-window-setup-finish'
;; and `view-mode-exit' to ascertain that quitting does _not_
;; inadvertently delete the frame.
(view-return-to-alist-update
help-buffer (cons help-window
(cons (selected-window) 'keep-frame)))
(help-window-setup-finish help-window nil t))
(t (t
;; The help window is shown on a new frame. In this case quitting ;; Not much to say here.
;; shall handle both, the help window _and_ its frame. We changed (help-window-display-message
;; the default of `view-remove-frame-by-deleting' to t in order to "Type \"q\" in help window to quit" help-window))))))
;; intuitively DTRT here.
(view-return-to-alist-update
help-buffer (cons help-window (cons (selected-window) t)))
(help-window-setup-finish help-window)))))
;; `with-help-window' is a wrapper for `with-output-to-temp-buffer' ;; `with-help-window' is a wrapper for `with-output-to-temp-buffer'
;; providing the following additional twists: ;; providing the following additional twists:
...@@ -1212,50 +1117,35 @@ window itself is specified by the variable `help-window'." ...@@ -1212,50 +1117,35 @@ window itself is specified by the variable `help-window'."
;; (1) Issue more accurate messages telling how to scroll and quit the ;; (1) Issue more accurate messages telling how to scroll and quit the
;; help window. ;; help window.
;; (2) Make `view-mode-exit' DTRT in more cases. ;; (2) An option (customizable via `help-window-select') to select the
;; (3) An option (customizable via `help-window-select') to select the
;; help window automatically. ;; help window automatically.
;; (4) A marker (`help-window-point-marker') to move point in the help ;; (3) A marker (`help-window-point-marker') to move point in the help
;; window to an arbitrary buffer position. ;; window to an arbitrary buffer position.
;; Note: It's usually always wrong to use `help-print-return-message' in ;; Note: It's usually always wrong to use `help-print-return-message' in
;; the body of `with-help-window'. ;; the body of `with-help-window'.
(defmacro with-help-window (buffer-name &rest body) (defmacro with-help-window (buffer-name &rest body)
"Display buffer BUFFER-NAME in a help window evaluating BODY. "Display buffer with name BUFFER-NAME in a help window evaluating BODY.
Select help window if the actual value of the user option Select help window if the actual value of the user option
`help-window-select' says so. Return last value in BODY." `help-window-select' says so. Return last value in BODY.
You can specify where and how to show the buffer by binding the
variable `temp-buffer-show-specifiers' to an appropriate value."
(declare (indent 1) (debug t)) (declare (indent 1) (debug t))
;; Bind list-of-frames to `frame-list' and list-of-window-tuples to a `(progn
;; list of one <window window-buffer window-start window-point> tuple ;; Reset `display-buffer-window': `display-buffer' is
;; for each live window. ;; supposed to set this to the window displaying the buffer plus
`(let ((list-of-frames (frame-list)) ;; some additional information.
(list-of-window-tuples (setq display-buffer-window nil)
(let (list) ;; Make `help-window-point-marker' point nowhere. The only place
(walk-windows ;; where this should be set to a buffer position is within BODY.
(lambda (window)
(push (list window (window-buffer window)
(window-start window) (window-point window))
list))
'no-mini t)
list)))
;; Make `help-window' t to trigger `help-mode-finish' to set
;; `help-window' to the actual help window.
(setq help-window t)
;; Make `help-window-point-marker' point nowhere (the only place
;; where this should be set to a buffer position is within BODY).
(set-marker help-window-point-marker nil) (set-marker help-window-point-marker nil)
(prog1 (prog1
;; Return value returned by `with-output-to-temp-buffer'. ;; Return value returned by `with-output-to-temp-buffer'.
(with-output-to-temp-buffer ,buffer-name (with-output-to-temp-buffer ,buffer-name
(progn ,@body)) (progn ,@body))
(when (windowp help-window) (when display-buffer-window (help-window-setup)))))
;; Set up help window.
(help-window-setup list-of-frames list-of-window-tuples))
;; Reset `help-window' to nil to avoid confusing future calls of
;; `help-mode-finish' with plain `with-output-to-temp-buffer'.
(setq help-window nil))))
;; Called from C, on encountering `help-char' when reading a char. ;; Called from C, on encountering `help-char' when reading a char.
;; Don't print to *Help*; that would clobber Help history. ;; Don't print to *Help*; that would clobber Help history.
......
...@@ -55,10 +55,6 @@ ...@@ -55,10 +55,6 @@
:type 'face :type 'face
:group 'view) :group 'view)
;; `view-mode-auto-exit' is replaced by the following option variable which
;; only says if scrolling past buffer end should leave view mode or not, it
;; doesn't say if leaving view mode should restore windows or not. The latter
;; is now controlled by the presence of a value in `view-return-to-alist'.
(defcustom view-scroll-auto-exit nil (defcustom view-scroll-auto-exit nil
"Non-nil means scrolling past the end of buffer exits View mode. "Non-nil means scrolling past the end of buffer exits View mode.
A value of nil means attempting to scroll past the end of the buffer, A value of nil means attempting to scroll past the end of the buffer,
...@@ -80,17 +76,14 @@ for all scroll commands in view mode." ...@@ -80,17 +76,14 @@ for all scroll commands in view mode."
If nil, make an icon of the frame. If non-nil, delete the frame." If nil, make an icon of the frame. If non-nil, delete the frame."
:type 'boolean :type 'boolean
:group 'view :group 'view
;; Changed the default of this to t for Emacs 23. Users consider