Fix bug #11964 with crashes inside internal-char-font on non-GUI frames.

 lips/descr-text.el (describe-char-padded-string): Call
 internal-char-font only on GUI frames.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e7f49b5345871fd170cb64b85a2e5a7e4e002b0..e92b8dd43df09f835b176bbb154739f8e1f2c4ef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * descr-text.el (describe-char-padded-string): Call
+       internal-char-font only on GUI frames.  (Bug#11964)
+
 2012-11-24  Andreas Schwab  <schwab@linux-m68k.org>
 
        * buff-menu.el (Buffer-menu-buffer+size-width): Fix customize type

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 0c7f82d516e8ff5857defd53c1eb1df0f3aba6c5..b2f62e581e01d104da6d0ee3067617bdf09dacdb 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -354,7 +354,8 @@ This function is semi-obsolete.  Use `get-char-code-property'."
 ;; Return a string of CH with composition for padding on both sides.
 ;; It is displayed without overlapping with the left/right columns.
 (defsubst describe-char-padded-string (ch)
-  (if (internal-char-font nil ch)
+  (if (and (display-multi-font-p)
+          (internal-char-font nil ch))
       (compose-string (string ch) 0 1 (format "\t%c\t" ch))
     (string ch)))