diff options
| author | Eli Zaretskii | 2021-09-27 12:28:54 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-09-27 12:28:54 +0300 |
| commit | 2403deca2bcffc62ff80e4c90a61fea1ea30a768 (patch) | |
| tree | 86f1e2222a7f8a07fc46ef380d7015a0564c1507 | |
| parent | 129efd9c0b05610794cbfbb4d88facda435a8fe6 (diff) | |
| download | emacs-2403deca2bcffc62ff80e4c90a61fea1ea30a768.tar.gz emacs-2403deca2bcffc62ff80e4c90a61fea1ea30a768.zip | |
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.
| -rw-r--r-- | lisp/term/w32-win.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 80afcb36040..5d1dc606676 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -532,7 +532,7 @@ characters from these blocks.") | |||
| 532 | (let (val) | 532 | (let (val) |
| 533 | (dolist (elt script-representative-chars) | 533 | (dolist (elt script-representative-chars) |
| 534 | (let ((subranges w32-no-usb-subranges) | 534 | (let ((subranges w32-no-usb-subranges) |
| 535 | (chars (cdr elt)) | 535 | (chars (append (cdr elt) nil)) ; handle vectors as well |
| 536 | ch found subrange) | 536 | ch found subrange) |
| 537 | (while (and (consp chars) (not found)) | 537 | (while (and (consp chars) (not found)) |
| 538 | (setq ch (car chars) | 538 | (setq ch (car chars) |
| @@ -595,7 +595,11 @@ default font on FRAME, or its best approximation." | |||
| 595 | 0 nchars script-chars) | 595 | 0 nchars script-chars) |
| 596 | '[nil])) | 596 | '[nil])) |
| 597 | ;; Does this font support ALL of the script's | 597 | ;; Does this font support ALL of the script's |
| 598 | ;; representative characters? | 598 | ;; representative characters? Note that, when the |
| 599 | ;; representative characters are specified as a | ||
| 600 | ;; vector, this is a more stringent test than font | ||
| 601 | ;; selection does, because supporting _any_ | ||
| 602 | ;; character from the vector is enough. | ||
| 599 | (setq idx 0) | 603 | (setq idx 0) |
| 600 | (while (and (< idx nchars) (not (null (aref glyphs idx)))) | 604 | (while (and (< idx nchars) (not (null (aref glyphs idx)))) |
| 601 | (setq idx (1+ idx))) | 605 | (setq idx (1+ idx))) |