From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 25 Mar 1996 15:09:27 +0000 (+0000)
Subject: (x-frob-font-slant): Properly handle a match against
X-Git-Tag: emacs-19.34~980
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=528fbf51268d26a0b11e28bb7599f6f6499575a5;p=emacs.git

(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 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)))))))