diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-11-25 18:28:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-11-25 18:28:38 +0200 |
| commit | 2147c6ab51ac1778f33c7431570a7c6d97ab74ae (patch) | |
| tree | 0a98b18bd7310886bf7e4492d4b608a1539ce8d1 | |
| parent | 0d35edba15dd87499ea2993c5380a701cc039f03 (diff) | |
| download | emacs-2147c6ab51ac1778f33c7431570a7c6d97ab74ae.tar.gz | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/descr-text.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e7f49b5345..e92b8dd43df 100644 --- 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 0c7f82d516e..b2f62e581e0 100644 --- 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))) |