diff options
| author | Stefan Monnier | 2012-11-19 15:57:36 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2012-11-19 15:57:36 -0500 |
| commit | 63f251724c324fc04d987877d06ca62ac1735b0a (patch) | |
| tree | d2b865becf3a7227c65a4c9b7699e3466b063fc6 | |
| parent | 93b050412adab7512b7ebc77077fdbbe72730114 (diff) | |
| download | emacs-63f251724c324fc04d987877d06ca62ac1735b0a.tar.gz emacs-63f251724c324fc04d987877d06ca62ac1735b0a.zip | |
* lisp/emacs-lisp/byte-run.el (defun-declarations-alist): Don't accept
non-symbols for compiler macros (yet).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-run.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2299df822f..7e9ed2502a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * emacs-lisp/byte-run.el (defun-declarations-alist): Don't accept | ||
| 4 | non-symbols for compiler macros (yet). | ||
| 5 | |||
| 3 | * eshell/em-cmpl.el (eshell-pcomplete): Refine fix for bug#12838: | 6 | * eshell/em-cmpl.el (eshell-pcomplete): Refine fix for bug#12838: |
| 4 | Fallback on completion-at-point rather than | 7 | Fallback on completion-at-point rather than |
| 5 | pcomplete-expand-and-complete, and only if pcomplete actually failed. | 8 | pcomplete-expand-and-complete, and only if pcomplete actually failed. |
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 462b4a25154..544b64bc3a6 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el | |||
| @@ -82,7 +82,9 @@ The return value of this function is not used." | |||
| 82 | `(make-obsolete ',f ',new-name ,when))) | 82 | `(make-obsolete ',f ',new-name ,when))) |
| 83 | (list 'compiler-macro | 83 | (list 'compiler-macro |
| 84 | #'(lambda (f _args compiler-function) | 84 | #'(lambda (f _args compiler-function) |
| 85 | `(put ',f 'compiler-macro #',compiler-function))) | 85 | (if (not (symbolp compiler-function)) |
| 86 | (error "Only symbols are supported in `compiler-macro'") | ||
| 87 | `(put ',f 'compiler-macro #',compiler-function)))) | ||
| 86 | (list 'doc-string | 88 | (list 'doc-string |
| 87 | #'(lambda (f _args pos) | 89 | #'(lambda (f _args pos) |
| 88 | (list 'put (list 'quote f) ''doc-string-elt (list 'quote pos)))) | 90 | (list 'put (list 'quote f) ''doc-string-elt (list 'quote pos)))) |