summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-generic.el
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2022-01-22 17:41:03 +0000
committerAlan Mackenzie <acm@muc.de>2022-01-22 17:41:03 +0000
commit88e1f8b02086aaf652e3058b36b7612c073c04b3 (patch)
tree0a12af666638c4629e2b0c34bcce1cad9945930e /lisp/emacs-lisp/cl-generic.el
parent1edde2fc7a1a82b0e65d2b7a4237e7c18d0bc0c1 (diff)
parent14d64a8adcc866deecd758b898e8ef2d836b354a (diff)
downloademacs-88e1f8b02086aaf652e3058b36b7612c073c04b3.tar.gz
emacs-88e1f8b02086aaf652e3058b36b7612c073c04b3.tar.bz2
emacs-88e1f8b02086aaf652e3058b36b7612c073c04b3.zip
Merge branch 'scratch/correct-warning-pos'
Diffstat (limited to 'lisp/emacs-lisp/cl-generic.el')
-rw-r--r--lisp/emacs-lisp/cl-generic.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 5090e060372..53691881ec2 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -498,7 +498,8 @@ The set of acceptable TYPEs (also called \"specializers\") is defined
cl--generic-edebug-make-name nil]
lambda-doc ; documentation string
def-body))) ; part to be debugged
- (let ((qualifiers nil))
+ (let ((qualifiers nil)
+ (org-name name))
(while (cl-generic--method-qualifier-p args)
(push args qualifiers)
(setq args (pop body)))
@@ -513,6 +514,7 @@ The set of acceptable TYPEs (also called \"specializers\") is defined
(byte-compile-warning-enabled-p 'obsolete name))
(let* ((obsolete (get name 'byte-obsolete-info)))
(macroexp-warn-and-return
+ org-name
(macroexp--obsolete-warning name obsolete "generic function")
nil)))
;; You could argue that `defmethod' modifies rather than defines the