[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/bytecomp.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/bytecomp.el
diff -u emacs/lisp/emacs-lisp/bytecomp.el:2.181 
emacs/lisp/emacs-lisp/bytecomp.el:2.182
--- emacs/lisp/emacs-lisp/bytecomp.el:2.181     Fri Jan 13 09:54:33 2006
+++ emacs/lisp/emacs-lisp/bytecomp.el   Sat Apr  8 14:56:21 2006
@@ -2765,9 +2765,15 @@
                (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))