diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2020-12-05 20:30:42 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2020-12-05 20:30:42 +0900 |
| commit | da92d5700eff8f628b6306202635a2514eb8b387 (patch) | |
| tree | e632bd68bf0286525e59ce35326986c1cb6f7755 /lisp/emacs-lisp/advice.el | |
| parent | d46a223d8595e8edb67c6361033625797503cacf (diff) | |
| parent | dc39c66d3bb6b1db6af0519659ff154bf6d8a5d1 (diff) | |
| download | emacs-da92d5700eff8f628b6306202635a2514eb8b387.tar.gz emacs-da92d5700eff8f628b6306202635a2514eb8b387.tar.bz2 emacs-da92d5700eff8f628b6306202635a2514eb8b387.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
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 bb45bb37d11..c8a6676b665 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) @@ -2224,8 +2223,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: |