2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b8a0e34cb2..f6c8615dd0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/byte-opt.el (byte-optimize-featurep): Also handle `sxemacs'.
+
 2007-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * image-mode.el (image-minor-mode): Use image-mode-text-map.
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 82a5cf0a75a..6f653c8fc6e 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1135,9 +1135,9 @@
 
 (put 'featurep 'byte-optimizer 'byte-optimize-featurep)
 (defun byte-optimize-featurep (form)
-  ;; Emacs-21's byte-code doesn't run under XEmacs anyway, so we can
-  ;; safely optimize away this test.
-  (if (equal '((quote xemacs)) (cdr-safe form))
+  ;; Emacs-21's byte-code doesn't run under XEmacs or SXEmacs anyway, so we
+  ;; can safely optimize away this test.
+  (if (member (cdr-safe form) '((quote xemacs) (quote sxemacs)))
       nil
     form))