diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-01-20 15:40:29 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-01-20 15:40:29 -0500 |
| commit | 3a8312d00e59b50e76121cd512177e999c18b06d (patch) | |
| tree | f34f91c2bfc196318febd809c9ec8304aae1fbc9 /lisp/emacs-lisp/bytecomp.el | |
| parent | f948b5d9ff60b40e361b2b9428eda2ad4c0ad105 (diff) | |
| download | emacs-3a8312d00e59b50e76121cd512177e999c18b06d.tar.gz | |
lisp/emacs-lisp/eieio*.el: Rewrite our generics on top of cl-generic
* lisp/emacs-lisp/eieio-generic.el: Remove.
(defgeneric, defmethod): Move to eieio-compat.el. Mark obsolete.
* lisp/emacs-lisp/eieio-compat.el: New file.
* lisp/emacs-lisp/eieio.el: Don't require eieio-generic any more.
* lisp/emacs-lisp/eieio-core.el (eieio--slot-originating-class-p):
Remove unused function.
(eieio-defclass): Move to eieio-compat.el.
* lisp/emacs-lisp/macroexp.el (macroexp-macroexpand): New function.
(macroexp--expand-all): Use it.
* lisp/emacs-lisp/bytecomp.el (byte-compile-recurse-toplevel): Here too.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 1acd4fe76b2..8440570d755 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -433,7 +433,7 @@ Return the compile-time value of FORM." ;; 3.2.3.1, "Processing of Top Level Forms". The semantics are very ;; subtle: see test/automated/bytecomp-tests.el for interesting ;; cases. - (setf form (macroexpand form byte-compile-macro-environment)) + (setf form (macroexp-macroexpand form byte-compile-macro-environment)) (if (eq (car-safe form) 'progn) (cons 'progn (mapcar (lambda (subform) |