Commit 528fbf51 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(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.
parent 0c12a958
......@@ -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)))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment