diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-26 19:10:32 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-26 19:10:32 -0800 |
| commit | 5c9cf0a3f9817220ed0f907637951f5cdf1a9614 (patch) | |
| tree | 05e4de196ed9935479f73f9db5d249684c7d19b4 /lisp/descr-text.el | |
| parent | 848a2dd19d1b030303de1b568edf9e33281e4440 (diff) | |
| parent | 369f945d0b71738812f237123dbe24938d65999e (diff) | |
| download | emacs-5c9cf0a3f9817220ed0f907637951f5cdf1a9614.tar.gz | |
Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/descr-text.el')
| -rw-r--r-- | lisp/descr-text.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el index c384b96df86..d531e15546a 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))) |