diff options
author | Miles Bader <miles@gnu.org> | 2007-08-27 04:00:19 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-08-27 04:00:19 +0000 |
commit | 7f22a76506a3f3db2eb4bce1cfc49105bd8d0824 (patch) | |
tree | 02ffae400506ae46fcf03eacaa5210aac7fe57de /lisp/emacs-lisp/byte-opt.el | |
parent | d53a60a6f76043ba9fb395eece2aaccc67a0d1b2 (diff) | |
parent | 619fb9ee822da1d92d8b7974b827dac6a918967f (diff) | |
download | emacs-7f22a76506a3f3db2eb4bce1cfc49105bd8d0824.tar.gz emacs-7f22a76506a3f3db2eb4bce1cfc49105bd8d0824.tar.bz2 emacs-7f22a76506a3f3db2eb4bce1cfc49105bd8d0824.zip |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860
Diffstat (limited to 'lisp/emacs-lisp/byte-opt.el')
-rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 80a6ad595b2..fdeab460c79 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1146,9 +1146,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)) |