Mercurial > emacs

changeset 89920:d0458e42e592

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(describe-char): Make it work on *Help* buffer. Suppress auto-compostion on a region describing about composition.
author Kenichi Handa <handa@m17n.org>
date Tue, 20 Apr 2004 05:25:47 +0000
parents 80fad817819f
children 2403258563d6
files lisp/descr-text.el
diffstat 1 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/descr-text.el	Tue Apr 20 05:24:12 2004 +0000
+++ b/lisp/descr-text.el	Tue Apr 20 05:25:47 2004 +0000
@@ -474,6 +474,7 @@
 			    standard-display-table))
 	 (disp-vector (and display-table (aref display-table char)))
 	 (multibyte-p enable-multibyte-characters)
+	 text-prop-description
 	 code item-list max-width)
     (or (and (charsetp charset) (encode-char char charset))
 	(setq charset (char-charset char)))
@@ -574,8 +575,17 @@
 						 (length (car x))
 					       0))
 					 item-list)))
-    (when (eq (current-buffer) (get-buffer "*Help*"))
-      (error "Can't describe char in Help buffer"))
+
+    (setq text-prop-description
+	  (with-temp-buffer
+	    (let ((buf (current-buffer)))
+	      (save-excursion
+		(set-buffer buffer)
+		(describe-text-properties pos buf)))
+	    (buffer-string)))
+
+    ;;(when (eq (current-buffer) (get-buffer "*Help*"))
+    ;;(error "Can't describe char in Help buffer"))
     (with-output-to-temp-buffer "*Help*"
       (with-current-buffer standard-output
 	(set-buffer-multibyte multibyte-p)
@@ -614,6 +624,7 @@
 		      (or (cdr (aref disp-vector i)) "-- not encodable --")
 		      "\n"))))
 
+	(setq pos (point))
 	(when composition
 	  (insert "\nComposed")
 	  (if (car composition)
@@ -649,11 +660,11 @@
 		      (or (cdr elt) "-- not encodable --"))))
 	  (insert "\nSee the variable `reference-point-alist' for "
 		  "the meaning of the rule.\n"))
+	(put-text-property pos (point) 'auto-composed t)
 
-	(let ((output (current-buffer)))
-	  (with-current-buffer buffer
-	    (describe-text-properties pos output))
-	  (describe-text-mode))))))
+	(insert text-prop-description)
+	(describe-text-mode)))))
+
 
 (defalias 'describe-char-after 'describe-char)
 (make-obsolete 'describe-char-after 'describe-char "21.5")