diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-01-15 00:19:44 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-01-15 00:19:44 -0500 |
| commit | 483c98a00d02197dd912d490daf9e521399d16a7 (patch) | |
| tree | 3e29fcbfd2e94adaeea6d5faa82dfc369d4f94da /lisp/emacs-lisp/cl-generic.el | |
| parent | 9def17e92bbb61e877bf092b562a92946cf43210 (diff) | |
| download | emacs-483c98a00d02197dd912d490daf9e521399d16a7.tar.gz | |
* lisp/emacs-lisp/eieio-core.el: Provide support for cl-generic.
(eieio--generic-tagcode): New function.
(cl-generic-tagcode-function): Use it.
(eieio--generic-tag-types): New function.
(cl-generic-tag-types-function): Use it.
(eieio-object-p): Tighten up the test.
* lisp/emacs-lisp/cl-generic.el (cl-generic-define-method): Fix paren typo.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store): Add
keysym arg instead of relying on internal var eieio--generic-call-key.
Update all callers.
(eieio-test-cl-generic-1): New tests.
Diffstat (limited to 'lisp/emacs-lisp/cl-generic.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 19e4ce0fbef..d94e4f103ae 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -305,10 +305,10 @@ which case this method will be invoked when the argument is `eql' to VAL. (setq i (1+ i)))) (if me (setcdr me (cons uses-cnm function)) (setf (cl--generic-method-table generic) - (cons `(,key ,uses-cnm . ,function) mt)) - ;; For aliases, cl--generic-name gives us the actual name. - (defalias (cl--generic-name generic) - (cl--generic-make-function generic))))) + (cons `(,key ,uses-cnm . ,function) mt))) + ;; For aliases, cl--generic-name gives us the actual name. + (defalias (cl--generic-name generic) + (cl--generic-make-function generic)))) (defmacro cl--generic-with-memoization (place &rest code) (declare (indent 1) (debug t)) |