Mercurial > emacs
changeset 14880:b405f39b5493
(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.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 25 Mar 1996 15:09:27 +0000 |
| parents | 70f79ccb9875 |
| children | e0a3004e029d |
| files | lisp/faces.el |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Mon Mar 25 01:47:33 1996 +0000 +++ b/lisp/faces.el Mon Mar 25 15:09:27 1996 +0000 @@ -660,8 +660,10 @@ ;; 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 @@ ;; 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)))))))