diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-03-25 15:09:27 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-03-25 15:09:27 +0000 |
| commit | dbb3548b62aba807dd58fea8bca7e4bbcfe80022 (patch) | |
| tree | b8d9257656dab5ce2ccd821d92242abf9ec49007 | |
| parent | 49fd1e3157dd5e9491881ca7b0ac8ca7a850eeea (diff) | |
| download | emacs-dbb3548b62aba807dd58fea8bca7e4bbcfe80022.tar.gz | |
(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.
| -rw-r--r-- | lisp/faces.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 93c4ec5ce25..6489bbcfaa7 100644 --- 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))))))) |