diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1cbe8d7914..390c816145a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-10-23 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/cl-macs.el (flet): Throw an error when trying to + byte-compile a redefinition of a function with special byte-compile + handling. (Bug#411) + 2008-10-22 Vinicius Jose Latorre <viniciusjl@ig.com.br> * ps-print.el: Deal with page sizes for label printes. Suggested by diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 9ca675f08c4..08864962f08 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1328,10 +1328,14 @@ go back to their previous definitions, or lack thereof). (let ((func (list 'function* (list 'lambda (cadr x) (list* 'block (car x) (cddr x)))))) - (if (and (cl-compiling-file) - (boundp 'byte-compile-function-environment)) - (push (cons (car x) (eval func)) - byte-compile-function-environment)) + (when (cl-compiling-file) + ;; Bug#411. It would be nice to fix this. + (and (get (car x) 'byte-compile) + (error "Byte-compiling a redefinition of `%s' \ +will not work - use `labels' instead" (symbol-name (car x)))) + (and (boundp 'byte-compile-function-environment) + (push (cons (car x) (eval func)) + byte-compile-function-environment))) (list (list 'symbol-function (list 'quote (car x))) func)))) bindings) body)) |