procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(describe-function, describe-variable)

Browse source 
(describe-syntax, describe-categories):
Use with-help-window instead of with-output-to-temp-buffer.
This commit is contained in:
Martin Rudalics 2007-11-10 09:59:54 +00:00
parent 4644fd351f
commit aa13a09404
2 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lisp/ChangeLog
View file

@ -1,3 +1,43 @@
2007-11-10 Martin Rudalics <rudalics@gmx.at>
* help.el (help-window, help-window-point-marker): New variables.
(help-window-select): New option.
(with-help-window): New macro for displaying help windows.
(help-window-display-message, help-window-setup-finish)
(help-window-setup): New functions used for setting up help windows.
(print-help-return-message): Reset help-window to nil.
(view-lossage): Use with-help-window instead of
with-output-to-temp-buffer and move help-window-point-marker after
inserted text.
(describe-bindings, describe-key, describe-mode): Use
with-help-window instead of with-output-to-temp-buffer.
* help-mode.el (help-mode): Set view-exit-action to bury the
buffer instead of fiddling with windows. Simplify code.
(help-mode-finish): When help-window eqs t set it to the selected
window and have with-help-window set up view-return-to-alist.
(help-buffer): Add autoload cookie.
* view.el (view-remove-frame-by-deleting): Change default value to t.
Add autoload cookie.
(view-exit-action, view-file, view-file-other-window)
(view-file-other-frame, view-buffer, view-buffer-other-window)
(view-buffer-other-frame): Rewrite doc strings.
(view-return-to-alist-update): New function to remove stale entries
from view-return-to-alist.
(view-mode-enter): Rewrite doc string and simplify code.
(view-mode-exit): Handle new case 'keep-frame. Don't reset
view-exit-action to nil. Simplify code and rewrite doc string.
* apropos.el (apropos-describe-plist):
* descr-text.el (describe-char):
* disp-table.el (describe-display-table):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* help-fns.el (describe-function, describe-variable)
(describe-syntax, describe-categories):
Use with-help-window instead of with-output-to-temp-buffer.
2007-11-10 Dan Nicolaescu <dann@ics.uci.edu>
* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize

10
lisp/help-fns.el
View file

@ -55,13 +55,12 @@
(message "You didn't specify a function")
(help-setup-xref (list #'describe-function function) (interactive-p))
(save-excursion
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(prin1 function)
;; Use " is " instead of a colon so that
;; it is easier to get out the function name using forward-sexp.
(princ " is ")
(describe-function-1 function)
(print-help-return-message)
(with-current-buffer standard-output
;; Return the text we displayed.
(buffer-string))))))
@ -517,7 +516,7 @@ it is displayed along with the global value."
locus (variable-binding-locus variable)))))
(help-setup-xref (list #'describe-variable variable buffer)
(interactive-p))
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(with-current-buffer buffer
(prin1 variable)
;; Make a hyperlink to the library if appropriate. (Don't
@ -685,7 +684,6 @@ it is displayed along with the global value."
(terpri)
(princ output))))
(print-help-return-message)
(save-excursion
(set-buffer standard-output)
;; Return the text we displayed.
@ -700,7 +698,7 @@ BUFFER defaults to the current buffer."
(interactive)
(setq buffer (or buffer (current-buffer)))
(help-setup-xref (list #'describe-syntax buffer) (interactive-p))
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(let ((table (with-current-buffer buffer (syntax-table))))
(with-current-buffer standard-output
(describe-vector table 'internal-describe-syntax-value)
@ -725,7 +723,7 @@ BUFFER should be a buffer or a buffer name."
(interactive)
(setq buffer (or buffer (current-buffer)))
(help-setup-xref (list #'describe-categories buffer) (interactive-p))
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(let ((table (with-current-buffer buffer (category-table))))
(with-current-buffer standard-output
(describe-vector table 'help-describe-category-set)