1 files changed, 15 insertions, 0 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index cb5b6af7d97..520ddce2b10 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -24,6 +24,21 @@
 
 ;;; Code:
 
+(eval-when-compile
+ ;; These used to be defsubsts, now they're subrs.  Avoid losing if we're
+ ;; being compiled with an old Emacs that still has defsubrs in it.
+ (put 'face-name 'byte-optimizer nil)
+ (put 'face-id 'byte-optimizer nil)
+ (put 'face-font 'byte-optimizer nil)
+ (put 'face-foreground 'byte-optimizer nil)
+ (put 'face-background 'byte-optimizer nil)
+ (put 'face-stipple 'byte-optimizer nil)
+ (put 'face-underline-p 'byte-optimizer nil)
+ (put 'set-face-font 'byte-optimizer nil)
+ (put 'set-face-foreground 'byte-optimizer nil)
+ (put 'set-face-background 'byte-optimizer nil)
+ (put 'set-stipple 'byte-optimizer nil)
+ (put 'set-face-underline-p 'byte-optimizer nil))
 
 ;;;; Functions for manipulating face vectors.