# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1135718693 0
# Node ID d6290d5c2df481115493cee7e6d396a27467d083
# Parent  eb33196c14d746ac3095486b1ffe8fa834739958
(describe-char): Set help-xref-stack-item
explicitly after buffer has been generated.  Revert previous
changes for optional  buffer argument.

diff -r eb33196c14d7 -r d6290d5c2df4 lisp/descr-text.el
--- a/lisp/descr-text.el	Tue Dec 27 21:11:50 2005 +0000
+++ b/lisp/descr-text.el	Tue Dec 27 21:24:53 2005 +0000
@@ -404,15 +404,13 @@
 
 
 ;;;###autoload
-(defun describe-char (pos &optional buf)
+(defun describe-char (pos)
   "Describe the character after POS (interactively, the character after point).
 The information includes character code, charset and code points in it,
 syntax, category, how the character is encoded in a file,
 character composition information (if relevant),
 as well as widgets, buttons, overlays, and text properties."
   (interactive "d")
-  (let ((help-buffer (help-buffer)))
-  (with-current-buffer  (if buf buf (current-buffer))
   (if (>= pos (point-max))
       (error "No character follows specified position"))
   (let* ((char (char-after pos))
@@ -586,12 +584,8 @@
     (setq max-width (apply #'max (mapcar #'(lambda (x)
 					     (if (cadr x) (length (car x)) 0))
 					 item-list)))
-    (let ((buffer (current-buffer)))
-      (with-current-buffer help-buffer
-	(help-setup-xref
-	 (list #'describe-char pos (if buf buf buffer))
-	 (interactive-p))))
-    (with-output-to-temp-buffer help-buffer
+    (help-setup-xref nil (interactive-p))
+    (with-output-to-temp-buffer (help-buffer)
       (with-current-buffer standard-output
 	(set-buffer-multibyte multibyte-p)
 	(let ((formatter (format "%%%ds:" max-width)))
@@ -693,8 +687,9 @@
 		  "the meaning of the rule.\n"))
 
         (if text-props-desc (insert text-props-desc))
+  	(setq help-xref-stack-item (list 'help-insert-string (buffer-string)))
 	(toggle-read-only 1)
-        (print-help-return-message)))))))
+	(print-help-return-message)))))
 
 (defalias 'describe-char-after 'describe-char)
 (make-obsolete 'describe-char-after 'describe-char "22.1")