[Emacs-diffs] emacs/lisp descr-text.el

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/11/19 01:11:09

Modified files:
        lisp           : descr-text.el 

Log message:
        (describe-char-padded-string): Compose with TAB
        only if there's a font for CH.
        (describe-char): Fix the condition for detecting a trivial
        composition.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/descr-text.el?cvsroot=emacs&r1=1.81&r2=1.82

Patches:
Index: descr-text.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/descr-text.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- descr-text.el       4 Nov 2009 04:32:07 -0000       1.81
+++ descr-text.el       19 Nov 2009 01:11:09 -0000      1.82
@@ -353,7 +353,9 @@
 ;; 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)
-  (compose-string (string ch) 0 1 (format "\t%c\t" ch)))
+  (if (internal-char-font nil ch)
+      (compose-string (string ch) 0 1 (format "\t%c\t" ch))
+    (string ch)))
 
 ;; Return a nicely formated list of categories; extended category
 ;; description is added to the category name as a tooltip
@@ -446,7 +448,8 @@
                                (setq glyph (lgstring-glyph components j))
                                (= (lglyph-from glyph) glyph-from))
                      (setq j (1+ j)))
-                   (if (and (= i (1- j))
+                   (if (and (= to (1+ from))
+                            (= i (1- j))
                             (setq glyph (lgstring-glyph components i))
                             (= char (lglyph-char glyph)))
                        ;; The composition is trivial.