diff options
| author | Miles Bader <miles@gnu.org> | 2006-04-09 00:38:22 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-04-09 00:38:22 +0000 |
| commit | 49d395cd57e646162e7f646a8561a416abacac82 (patch) | |
| tree | d7fabed45dfc19d6bff30024f82613f372b97951 /lisp/emacs-lisp/bytecomp.el | |
| parent | b6828792a25d042ede1ed164389531e30cc3e202 (diff) | |
| parent | 1b155fbd766b0a0f78fca5de62dd16a3542883f1 (diff) | |
| download | emacs-49d395cd57e646162e7f646a8561a416abacac82.tar.gz emacs-49d395cd57e646162e7f646a8561a416abacac82.tar.bz2 emacs-49d395cd57e646162e7f646a8561a416abacac82.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-54
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 190-203)
- Update from CVS
- Undo incorrect merge of etc/images/README from Gnus 5.10
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 74-80)
- Update from CVS
- Update from CVS: README: Addition from 5.10.6 tar ball.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 5e415b870ee..f87300e8666 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2765,9 +2765,15 @@ If FORM is a lambda or a macro, byte-compile it as a function." (byte-compile-warn "`%s' used from Lisp code\n\ That command is designed for interactive use only" fn)) (if (and handler - (or (not (byte-compile-version-cond - byte-compile-compatibility)) - (not (get (get fn 'byte-opcode) 'emacs19-opcode)))) + ;; Make sure that function exists. This is important + ;; for CL compiler macros since the symbol may be + ;; `cl-byte-compile-compiler-macro' but if CL isn't + ;; loaded, this function doesn't exist. + (or (not (memq handler '(cl-byte-compile-compiler-macro))) + (fboundp handler)) + (not (and (byte-compile-version-cond + byte-compile-compatibility) + (get (get fn 'byte-opcode) 'emacs19-opcode)))) (funcall handler form) (when (memq 'callargs byte-compile-warnings) (if (memq fn '(custom-declare-group custom-declare-variable custom-declare-face)) |