(mouse-set-font): Update nonstandard faces that are supposed

to use a modification of the frame's font.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 7c6648df3028db767f6c232b2390e49dbb461bc9..5139086bb478daf860e9a429abeeffc2fce5c6d6 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1279,7 +1279,24 @@ and selects that window."
             (set-face-font 'italic nil (selected-frame))
             (make-face-italic 'italic (selected-frame) t)
             (set-face-font 'bold-italic nil (selected-frame))
-            (make-face-bold-italic 'bold-italic (selected-frame) t))))
+            (make-face-bold-italic 'bold-italic (selected-frame) t)
+            ;; Update any nonstandard faces whose definition is
+            ;; "a bold/italic/bold&italic version of the frame's font".
+            (let ((rest global-face-data))
+              (while rest
+                (condition-case nil
+                    (if (listp (face-font (cdr (car rest))))
+                        (let ((bold (memq 'bold (face-font (cdr (car rest)))))
+                              (italic (memq 'italic (face-font (cdr (car rest))))))
+                          (if (and bold italic)
+                              (make-face-bold-italic (car (car rest)) (selected-frame))
+                            (if bold
+                                (make-face-bold (car (car rest)) (selected-frame))
+                              (if italic
+                                  (make-face-italic (car (car rest)) (selected-frame)))))))
+                  (error nil))
+                (setq rest (cdr rest))))
+            )))
 \f
 ;;; Bindings for mouse commands.