Commit 25a3c9d1 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(describe-char): Rework last fix to solve the problem

is the same way it's solved for everything else in that function
(i.e. by extracting the info before setting up the *Help* buffer).
parent c71abb54
2005-12-12 Stefan Monnier <monnier@iro.umontreal.ca>
* descr-text.el (describe-char): Rework last fix to solve the problem
is the same way it's solved for everything else in that function
(i.e. by extracting the info before setting up the *Help* buffer).
2005-12-12 Kim F. Storm <storm@cua.dk>
 
* subr.el (version-regexp-alist): Allow space as separator before
......
......@@ -464,9 +464,13 @@ as well as widgets, buttons, overlays, and text properties."
(single-key-description char)
(string-to-multibyte
(char-to-string char)))))
(orig-buf (current-buffer))
(help-buf (if (eq orig-buf (get-buffer "*Help*"))
"*Help-2*" "*Help*"))
(text-props-desc
(let ((tmp-buf (generate-new-buffer " *text-props*")))
(unwind-protect
(progn
(describe-text-properties pos tmp-buf)
(with-current-buffer tmp-buf (buffer-string)))
(kill-buffer tmp-buf))))
item-list max-width unicode)
(if (or (< char 256)
......@@ -619,7 +623,7 @@ as well as widgets, buttons, overlays, and text properties."
(setq max-width (apply #'max (mapcar #'(lambda (x)
(if (cadr x) (length (car x)) 0))
item-list)))
(with-output-to-temp-buffer help-buf
(with-output-to-temp-buffer "*Help*"
(with-current-buffer standard-output
(set-buffer-multibyte multibyte-p)
(let ((formatter (format "%%%ds:" max-width)))
......@@ -722,9 +726,7 @@ as well as widgets, buttons, overlays, and text properties."
(insert "\nSee the variable `reference-point-alist' for "
"the meaning of the rule.\n"))
(save-excursion
(set-buffer orig-buf)
(describe-text-properties pos help-buf))
(if text-props-desc (insert text-props-desc))
(describe-text-mode)))))
(defalias 'describe-char-after 'describe-char)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment