(make-face-unbold, make-face-unitalic, make-face-bold, make-face-italic,

make-face-bold-italic): Don't try to frob font if it's nil.

diff --git a/lisp/faces.el b/lisp/faces.el
index 9af2a9a9371c3175d27f96cefa93a65d6bbb08bd..a058292ab3950fd292403cdd4df712e31afd96e8 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -544,7 +544,7 @@ If NOERROR is non-nil, return nil on failure."
        (setq font (or font
                       (face-font 'default frame)
                       (cdr (assq 'font (frame-parameters frame)))))
-       (make-face-bold-internal face frame font))
+       (and font (make-face-bold-internal face frame font)))
       (or (not (equal ofont (face-font face)))
          (and (not noerror)
               (error "No bold version of %S" font))))))
@@ -582,7 +582,7 @@ If NOERROR is non-nil, return nil on failure."
        (setq font (or font
                       (face-font 'default frame)
                       (cdr (assq 'font (frame-parameters frame)))))
-       (make-face-italic-internal face frame font))
+       (and font (make-face-italic-internal face frame font)))
       (or (not (equal ofont (face-font face)))
          (and (not noerror)
               (error "No italic version of %S" font))))))
@@ -618,7 +618,7 @@ If NOERROR is non-nil, return nil on failure."
        (setq font (or font
                       (face-font 'default frame)
                       (cdr (assq 'font (frame-parameters frame)))))
-       (make-face-bold-italic-internal face frame font))
+       (and font (make-face-bold-italic-internal face frame font)))
       (or (not (equal ofont (face-font face)))
          (and (not noerror)
               (error "No bold italic version of %S" font))))))
@@ -672,7 +672,7 @@ If NOERROR is non-nil, return nil on failure."
        (setq font1 (or font1
                        (face-font 'default frame)
                        (cdr (assq 'font (frame-parameters frame)))))
-       (setq font (x-make-font-unbold font1))
+       (setq font (and font1 (x-make-font-unbold font1)))
        (if font (internal-try-face-font face font frame)))
       (or (not (equal ofont (face-font face)))
          (and (not noerror)
@@ -704,7 +704,7 @@ If NOERROR is non-nil, return nil on failure."
        (setq font1 (or font1
                        (face-font 'default frame)
                        (cdr (assq 'font (frame-parameters frame)))))
-       (setq font (x-make-font-unitalic font1))
+       (setq font (and font1 (x-make-font-unitalic font1)))
        (if font (internal-try-face-font face font frame)))
       (or (not (equal ofont (face-font face)))
          (and (not noerror)