diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-12-06 18:07:27 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-12-06 18:07:27 +0100 |
| commit | 715a1ca1744f9a5918376bf7662c81302f0b20c0 (patch) | |
| tree | e6ea1ac67e88ead92df65087d3f41b8e544f5e86 /lisp/emacs-lisp/advice.el | |
| parent | 27f666e111a34d64de81a214024e1e30928b416e (diff) | |
| parent | 40e11743ca3803bdc2c6c612f35ab695efb3eb8b (diff) | |
| download | emacs-715a1ca1744f9a5918376bf7662c81302f0b20c0.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/advice.el')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index e16ce9fded8..4c9d709697c 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1840,8 +1840,7 @@ function at point for which PREDICATE returns non-nil)." (or default ;; Prefer func name at point, if it's an advised function etc. (let ((function (progn - (require 'help) - (function-called-at-point)))) + (function-called-at-point)))) (and function (member (symbol-name function) ad-advised-functions) (or (null predicate) @@ -2229,8 +2228,6 @@ For that it has to be fbound with a non-autoload definition." (let ((byte-compile-warnings byte-compile-warnings) ;; Don't pop up windows showing byte-compiler warnings. (warning-suppress-types '((bytecomp)))) - (if (featurep 'cl) - (byte-compile-disable-warning 'cl-functions)) (byte-compile (ad-get-advice-info-field function 'advicefunname)))) ;; @@@ Accessing argument lists: |