emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 2403dec: Minor fix in 'w32-find-non-USB-fonts'


From: Eli Zaretskii
Subject: master 2403dec: Minor fix in 'w32-find-non-USB-fonts'
Date: Mon, 27 Sep 2021 05:29:53 -0400 (EDT)

branch: master
commit 2403deca2bcffc62ff80e4c90a61fea1ea30a768
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Minor fix in 'w32-find-non-USB-fonts'
    
    * lisp/term/w32-win.el (w32--filter-USB-scripts): Handle
    representative characters given as a vector, not a list.
---
 lisp/term/w32-win.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 80afcb3..5d1dc60 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -532,7 +532,7 @@ characters from these blocks.")
   (let (val)
     (dolist (elt script-representative-chars)
       (let ((subranges w32-no-usb-subranges)
-            (chars (cdr elt))
+            (chars (append (cdr elt) nil)) ; handle vectors as well
             ch found subrange)
         (while (and (consp chars) (not found))
           (setq ch (car chars)
@@ -595,7 +595,11 @@ default font on FRAME, or its best approximation."
                                              0 nchars script-chars)
                           '[nil]))
                   ;; Does this font support ALL of the script's
-                  ;; representative characters?
+                  ;; representative characters?  Note that, when the
+                  ;; representative characters are specified as a
+                  ;; vector, this is a more stringent test than font
+                  ;; selection does, because supporting _any_
+                  ;; character from the vector is enough.
                   (setq idx 0)
                   (while (and (< idx nchars) (not (null (aref glyphs idx))))
                     (setq idx (1+ idx)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]