summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-07-02 09:33:51 +0200
committerStefan Kangas <stefan@marxist.se>2022-07-02 09:33:51 +0200
commit52c91122eecb0f679de46d539fc85b8e28599fe1 (patch)
tree651f2838ae6bb4254ebf9c72e558d660515e8443 /lisp/emacs-lisp
parent9dc0fdfdc14beb5d19b705b25bf01020df27541b (diff)
parent1c3d107cb5367098d592b69d02beedd7aa9ded16 (diff)
downloademacs-52c91122eecb0f679de46d539fc85b8e28599fe1.tar.gz
emacs-52c91122eecb0f679de46d539fc85b8e28599fe1.tar.bz2
emacs-52c91122eecb0f679de46d539fc85b8e28599fe1.zip
Merge from origin/emacs-28
1c3d107cb5 Fix "C-u C-x =" for SPC 7e33618bbc ; * src/fns.c (Frequire): Fix a typo in the doc string. (... 6908309827 Doc fixes: don't refer to some obsolete items dc3cb749f3 Remove obsolete cust-print from elisp index 9ffbbddf8e * admin/make-tarball.txt: Minor clarifications. f5421104e9 Fix external image conversion on MS-Windows 6f22631a63 * doc/emacs/buffers.texi (Indirect Buffers): Mention modif... # Conflicts: # doc/emacs/buffers.texi # lisp/emacs-lisp/nadvice.el # lisp/image/image-converter.el
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/nadvice.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 00c9e5438b8..2d5a1b5e77b 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -313,7 +313,7 @@ different, but `function-equal' will hopefully ignore those differences.")
(defmacro add-function (how place function &optional props)
;; TODO:
;; - maybe let `how' specify some kind of predicate and use it
- ;; to implement things like mode-local or eieio-defmethod.
+ ;; to implement things like mode-local or cl-defmethod.
;; Of course, that only makes sense if the predicates of all advices can
;; be combined and made more efficient.
;; :before is like a normal add-hook on a normal hook.
@@ -352,7 +352,7 @@ is also interactive. There are 3 cases:
(declare
;;(indent 2)
(debug (form [&or symbolp ("local" form) ("var" sexp) gv-place]
- form &optional form)))
+ form &optional form)))
`(advice--add-function ,how (gv-ref ,(advice--normalize-place place))
,function ,props))