diff options
Diffstat (limited to 'lisp/international/mule-diag.el')
| -rw-r--r-- | lisp/international/mule-diag.el | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index d97d090cd08..02169ceb689 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -45,8 +45,8 @@ (define-button-type 'sort-listed-character-sets 'help-echo (purecopy "mouse-2, RET: sort on this column") 'face 'bold - 'action #'(lambda (button) - (sort-listed-character-sets (button-get button 'sort-key)))) + 'action (lambda (button) + (sort-listed-character-sets (button-get button 'sort-key)))) (define-button-type 'list-charset-chars :supertype 'help-xref @@ -835,6 +835,8 @@ The IGNORED argument is ignored." (list (completing-read "Font name (default current choice for ASCII chars): " (and window-system + ;; Implied by `window-system'. + (fboundp 'x-list-fonts) (fboundp 'fontset-list) ;; The final element in `fontset-list' is a default ;; (generic) one, so don't include that. @@ -903,13 +905,13 @@ The IGNORED argument is ignored." (setq family "*-*") (if (symbolp family) (setq family (symbol-name family))) - (or (string-match "-" family) + (or (string-search "-" family) (setq family (concat "*-" family)))) (if (not registry) (setq registry "*-*") (if (symbolp registry) (setq registry (symbol-name registry))) - (or (string-match "-" registry) + (or (string-search "-" registry) (= (aref registry (1- (length registry))) ?*) (setq registry (concat registry "*")))) (insert (format"\n -%s-%s-%s-%s-%s-*-*-*-*-*-*-%s" @@ -1170,12 +1172,12 @@ The default is 20. If LIMIT is negative, do not limit the listing." (if (or (vectorp elt) (listp elt)) (let ((i 0)) (catch 'tag - (mapc #'(lambda (x) - (setq i (1+ i)) - (when (= i limit) - (insert " ...\n") - (throw 'tag nil)) - (insert (format " %s\n" x))) + (mapc (lambda (x) + (setq i (1+ i)) + (when (= i limit) + (insert " ...\n") + (throw 'tag nil)) + (insert (format " %s\n" x))) elt))) (insert (format " %s\n" elt))))))) |