diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-24 11:09:25 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-24 11:09:25 -0400 |
| commit | 4b85ae6a24380fb67a3315eaec9233f17a872473 (patch) | |
| tree | 31c466ed5faa5ef68e80b81d7394e6ded4989804 /lisp/emacs-lisp | |
| parent | 2084f4ada38c3ebaaf77806f32a79073fc9f0bf4 (diff) | |
| parent | 0df73dabc1690b66eb62eac10ff62db1863b256e (diff) | |
| download | emacs-4b85ae6a24380fb67a3315eaec9233f17a872473.tar.gz emacs-4b85ae6a24380fb67a3315eaec9233f17a872473.tar.bz2 emacs-4b85ae6a24380fb67a3315eaec9233f17a872473.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/nadvice.el | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 3fd85bcb880..b3ade3b8943 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -94,11 +94,6 @@ ;; This second one is closely related to what we do here (and that's ;; the name "generalizer" comes from). -;; The autoloads.el mechanism which adds package--builtin-versions -;; maintenance to loaddefs.el doesn't work for preloaded packages (such -;; as this one), so we have to do it by hand! -(push (purecopy '(cl-generic 1 0)) package--builtin-versions) - ;; Note: For generic functions that dispatch on several arguments (i.e. those ;; which use the multiple-dispatch feature), we always use the same "tagcodes" ;; and the same set of arguments on which to dispatch. This works, but is diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index db33474c605..b4acd423b8d 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -4,6 +4,7 @@ ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: extensions, lisp, tools +;; Version: 1.0 ;; This file is part of GNU Emacs. @@ -37,11 +38,6 @@ ;;; Code: -;; The autoloads.el mechanism which adds package--builtin-versions -;; maintenance to loaddefs.el doesn't work for preloaded packages (such -;; as this one), so we have to do it by hand! -(push (purecopy '(nadvice 1 0)) package--builtin-versions) - (oclosure-define (advice (:predicate advice--p) (:copier advice--cons (cdr)) |