diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57aaea0f4ce..c6e315e1260 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -38,6 +38,9 @@ 2015-01-15 Stefan Monnier <monnier@iro.umontreal.ca> + * emacs-lisp/cl-generic.el (cl--generic-build-combined-method): + Return the value of the primary rather than the after method. + * emacs-lisp/eieio-core.el: Provide support for cl-generic. (eieio--generic-tagcode): New function. (cl-generic-tagcode-function): Use it. diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 41a419a3c4a..21688bef18a 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -411,9 +411,10 @@ for all those different tags in the method-cache.") (setq fun (lambda (&rest args) (dolist (bf before) (apply bf args)) - (apply next args) - (dolist (af after) - (apply af args)))))) + (prog1 + (apply next args) + (dolist (af after) + (apply af args))))))) (cl--generic-nest fun (alist-get :around mets-by-qual)))))))) (defun cl--generic-cache-miss (generic dispatch-arg dispatches-left tags) |