[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110958: Fix bug #11964 with crashes inside internal-char-font on non-GUI frames.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110958
fixes bug: http://debbugs.gnu.org/11964
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-11-25 18:28:38 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/descr-text.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-24 23:07:13 +0000
+++ b/lisp/ChangeLog    2012-11-25 16:28:38 +0000
@@ -1,3 +1,8 @@
+2012-11-25  Eli Zaretskii  <address@hidden>
+
+       * descr-text.el (describe-char-padded-string): Call
+       internal-char-font only on GUI frames.  (Bug#11964)
+
 2012-11-24  Andreas Schwab  <address@hidden>
 
        * buff-menu.el (Buffer-menu-buffer+size-width): Fix customize type

=== modified file 'lisp/descr-text.el'
--- a/lisp/descr-text.el        2012-08-20 11:12:16 +0000
+++ b/lisp/descr-text.el        2012-11-25 16:28:38 +0000
@@ -354,7 +354,8 @@
 ;; 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)))