[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 639fd22 4/6: Pacify byte-compiler for with-wrapper-
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 639fd22 4/6: Pacify byte-compiler for with-wrapper-hook |
Date: |
Wed, 18 May 2016 07:49:35 +0000 (UTC) |
branch: master
commit 639fd22e294fa1702c93531ebb96efb4f3cdffbd
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Pacify byte-compiler for with-wrapper-hook
* lisp/subr.el (subr--with-wrapper-hook-no-warnings):
New macro, split out from with-wrapper-hook.
* lisp/abbrev.el (abbrev--default-expand):
* lisp/minibuffer.el (completion--in-region):
* lisp/simple.el (buffer-substring--filter):
* lisp/subr.el (with-wrapper-hook):
Use it.
---
lisp/abbrev.el | 2 +-
lisp/minibuffer.el | 2 +-
lisp/simple.el | 3 ++-
lisp/subr.el | 4 ++++
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 7814ea2..163dc8e 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -848,7 +848,7 @@ if expansion occurred, else nil.)"
"Default function to use for `abbrev-expand-function'.
This respects the wrapper hook `abbrev-expand-functions'.
Calls `abbrev-insert' to insert any expansion, and returns what it does."
- (with-wrapper-hook abbrev-expand-functions ()
+ (subr--with-wrapper-hook-no-warnings abbrev-expand-functions ()
(pcase-let ((`(,sym ,name ,wordstart ,wordend) (abbrev--before-point)))
(when sym
(let ((startpos (copy-marker (point) t))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 1ee05d3..9190c1f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1970,7 +1970,7 @@ if there was no valid completion, else t."
"Default function to use for `completion-in-region-function'.
Its arguments and return value are as specified for `completion-in-region'.
This respects the wrapper hook `completion-in-region-functions'."
- (with-wrapper-hook
+ (subr--with-wrapper-hook-no-warnings
;; FIXME: Maybe we should use this hook to provide a "display
;; completions" operation as well.
completion-in-region-functions (start end collection predicate)
diff --git a/lisp/simple.el b/lisp/simple.el
index e257062..65664c9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4061,7 +4061,8 @@ Its arguments and return value are as specified for
`filter-buffer-substring'.
This respects the wrapper hook `filter-buffer-substring-functions',
and the abnormal hook `buffer-substring-filters'.
No filtering is done unless a hook says to."
- (with-wrapper-hook filter-buffer-substring-functions (beg end delete)
+ (subr--with-wrapper-hook-no-warnings
+ filter-buffer-substring-functions (beg end delete)
(cond
((or delete buffer-substring-filters)
(save-excursion
diff --git a/lisp/subr.el b/lisp/subr.el
index 0fa6404..438f00a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1546,6 +1546,10 @@ FUN is then called once."
(declare (indent 2) (debug (form sexp body))
(obsolete "use a <foo>-function variable modified by
`add-function'."
"24.4"))
+ `(subr--with-wrapper-hook-no-warnings ,hook ,args ,@body))
+
+(defmacro subr--with-wrapper-hook-no-warnings (hook args &rest body)
+ "Like (with-wrapper-hook HOOK ARGS BODY), but without warnings."
;; We need those two gensyms because CL's lexical scoping is not available
;; for function arguments :-(
(let ((funs (make-symbol "funs"))
- [Emacs-diffs] master updated (631ca55 -> 07ebcf1), Paul Eggert, 2016/05/18
- [Emacs-diffs] master b4d1cdd 5/6: Pacify byte-compiler for byte-compile-macroexpand-declare-function, Paul Eggert, 2016/05/18
- [Emacs-diffs] master 6f5db02 1/6: Sync from gnulib, Paul Eggert, 2016/05/18
- [Emacs-diffs] master 07ebcf1 6/6: ‘make check-declare’ now chatters less, Paul Eggert, 2016/05/18
- [Emacs-diffs] master ccd5156 3/6: Pacify byte-compiler in lisp/url, Paul Eggert, 2016/05/18
- [Emacs-diffs] master 639fd22 4/6: Pacify byte-compiler for with-wrapper-hook,
Paul Eggert <=
- [Emacs-diffs] master 374f6a5 2/6: Port --enable-gcc-warnings to GCC 6.1, Paul Eggert, 2016/05/18