debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs/notmuch.el: don't use 'function' as variable name.

Browse source 
In principle this should work, but at least in some pre-release
versions of emacs26, this causes problems inside lexical let [1].

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26406
This commit is contained in:
David Bremner 2017-04-08 14:03:29 -03:00
parent 18ee87e7ce
commit 0b76e4a6f4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
emacs/notmuch.el
View file

@ -402,17 +402,17 @@ returns nil"
(next-single-property-change (or pos (point)) 'notmuch-search-result (next-single-property-change (or pos (point)) 'notmuch-search-result
nil (point-max)))) nil (point-max))))
(defun notmuch-search-foreach-result (beg end function) (defun notmuch-search-foreach-result (beg end fn)
"Invoke FUNCTION for each result between BEG and END. "Invoke FN for each result between BEG and END.
FUNCTION should take one argument. It will be applied to the FN should take one argument. It will be applied to the
character position of the beginning of each result that overlaps character position of the beginning of each result that overlaps
the region between points BEG and END. As a special case, if (= the region between points BEG and END. As a special case, if (=
BEG END), FUNCTION will be applied to the result containing point BEG END), FN will be applied to the result containing point
BEG." BEG."
(lexical-let ((pos (notmuch-search-result-beginning beg)) (lexical-let ((pos (notmuch-search-result-beginning beg))
;; End must be a marker in case function changes the ;; End must be a marker in case fn changes the
;; text. ;; text.
(end (copy-marker end)) (end (copy-marker end))
;; Make sure we examine at least one result, even if ;; Make sure we examine at least one result, even if
@ -423,7 +423,7 @@ BEG."
;; pos. ;; pos.
(while (and pos (or (< pos end) first)) (while (and pos (or (< pos end) first))
(when (notmuch-search-get-result pos) (when (notmuch-search-get-result pos)
(funcall function pos)) (funcall fn pos))
(setq pos (notmuch-search-result-end pos) (setq pos (notmuch-search-result-end pos)
first nil)))) first nil))))
;; Unindent the function argument of notmuch-search-foreach-result so ;; Unindent the function argument of notmuch-search-foreach-result so