From: Kenichi Handa <handa@m17n.org>
Date: Fri, 11 Jan 2008 04:16:14 +0000 (+0000)
Subject: (describe-char-display): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~37
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6bbf9f489e6704a9c082eaa702479e86c8827ef;p=emacs.git

(describe-char-display): Fix previous change.
---

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 47d17664e67..dfa87308fbe 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -336,11 +336,12 @@ This function is semi-obsolete.  Use `get-char-code-property'."
 (defun describe-char-display (pos char)
   (if (display-graphic-p (selected-frame))
       (let ((char-font-info (internal-char-font pos char)))
-	(if (integerp (cdr char-font-info))
-	    (setcdr char-font-info (format "%02X" (cdr char-font-info)))
-	  (setcdr char-font-info
-		  (format "%04X%04X"
-			  (cadr char-font-info) (cddr char-font-info))))
+	(if char-font-info
+	    (if (integerp (cdr char-font-info))
+		(setcdr char-font-info (format "%02X" (cdr char-font-info)))
+	      (setcdr char-font-info
+		      (format "%04X%04X"
+			      (cadr char-font-info) (cddr char-font-info)))))
 	char-font-info)
     (let* ((coding (terminal-coding-system))
 	   (encoded (encode-coding-char char coding)))