Mercurial > emacs

comparison lisp/emacs-lisp/advice.el @ 90043:e24e2e78deda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-69 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656 Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68 Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 04 Nov 2004 08:55:40 +0000
parents 68c22ea6027c 7b2c608f3b0b
children 4da4a09e8b1b
comparison
equal deleted inserted replaced
90042:003d95404d71 90043:e24e2e78deda
3104 orig-interactive-p 3104 orig-interactive-p
3105 (not interactive-form) 3105 (not interactive-form)
3106 (not advised-interactive-form)) 3106 (not advised-interactive-form))
3107 ;; Check whether we were called interactively 3107 ;; Check whether we were called interactively
3108 ;; in order to do proper prompting: 3108 ;; in order to do proper prompting:
3109 `(if (interactive-p) 3109 `(if (called-interactively-p)
3110 (call-interactively ',origname) 3110 (call-interactively ',origname)
3111 ,(ad-make-mapped-call orig-arglist 3111 ,(ad-make-mapped-call orig-arglist
3112 advised-arglist 3112 advised-arglist
3113 origname))) 3113 origname)))
3114 ;; And now for normal functions and non-interactive subrs 3114 ;; And now for normal functions and non-interactive subrs