(x-frob-font-slant): Properly handle a match against

x-font-regexp-head.
(x-frob-font-weight): Separate two cond cases by analogy with
x-frob-font-slant.

diff --git a/lisp/faces.el b/lisp/faces.el
index 93c4ec5ce2509bc6c74444f27d2af8a32e878e6e..6489bbcfaa71eeabbecf7a81c47e75af1dbebd33 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -660,8 +660,10 @@ also the same size as FACE on FRAME, or fail."
                   ;; for related fonts.
                   "*"
                   (substring font (match-end x-font-regexp-adstyle-subnum))))
-         ((or (string-match x-font-regexp-head font)
-              (string-match x-font-regexp-weight font))
+         ((string-match x-font-regexp-head font)
+          (concat (substring font 0 (match-beginning 1)) which
+                  (substring font (match-end 1))))
+         ((string-match x-font-regexp-weight font)
           (concat (substring font 0 (match-beginning 1)) which
                   (substring font (match-end 1)))))))
 
@@ -678,8 +680,10 @@ also the same size as FACE on FRAME, or fail."
                   ;; for related fonts.
                   "*"
                   (substring font (match-end x-font-regexp-adstyle-subnum))))
-         ((or (string-match x-font-regexp-head font)
-              (string-match x-font-regexp-slant font))
+         ((string-match x-font-regexp-head font)
+          (concat (substring font 0 (match-beginning 2)) which
+                  (substring font (match-end 2))))
+         ((string-match x-font-regexp-slant font)
           (concat (substring font 0 (match-beginning 1)) which
                   (substring font (match-end 1)))))))