summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-generic.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-01-15 08:38:00 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2015-01-16 17:48:59 -0500
commit9d940c667ab1dadc9d25a88cc2af1594b6c1bb49 (patch)
treeb50713180efcb5d3c041909db3e48598740a051f /lisp/emacs-lisp/cl-generic.el
parent78e6ccc4a5006272b14f352e459a6d3bf52ed07b (diff)
downloademacs-9d940c667ab1dadc9d25a88cc2af1594b6c1bb49.tar.gz
* lisp/emacs-lisp/cl-generic.el (cl--generic-build-combined-method):
Return the value of the primary rather than the after method.
Diffstat (limited to 'lisp/emacs-lisp/cl-generic.el')
-rw-r--r--lisp/emacs-lisp/cl-generic.el7
1 files changed, 4 insertions, 3 deletions
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)