[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 87baf12: Fix 'fontset-name-p'
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 87baf12: Fix 'fontset-name-p' |
Date: |
Sun, 10 Dec 2017 12:46:57 -0500 (EST) |
branch: emacs-26
commit 87baf1242e9c0130148e5547804db6f1fbfb8c55
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix 'fontset-name-p'
* lisp/international/fontset.el (fontset-name-p): Make the
function work with full fontset names and fontset alias names.
---
lisp/international/fontset.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index c6c62ef..b7511d9 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1147,10 +1147,14 @@ given from DEFAULT-SPEC."
(defun fontset-name-p (fontset)
"Return non-nil if FONTSET is valid as fontset name.
A valid fontset name should conform to XLFD (X Logical Font Description)
-with \"fontset\" in `<CHARSET_REGISTRY>' field."
- (and (string-match xlfd-tight-regexp fontset)
- (string= (match-string (1+ xlfd-regexp-registry-subnum) fontset)
- "fontset")))
+with \"fontset-SOMETHING\" in `<CHARSET_REGISTRY>' field.
+A fontset alias name recorded in `fontset-alias-alist' is also a valid
+fontset name."
+ (or (and (string-match xlfd-tight-regexp fontset)
+ (let ((registry
+ (match-string (1+ xlfd-regexp-registry-subnum) fontset)))
+ (= 0 (string-match "\\`fontset-" registry))))
+ (consp (rassoc fontset fontset-alias-alist))))
(declare-function fontset-list "fontset.c" ())
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 87baf12: Fix 'fontset-name-p',
Eli Zaretskii <=