From: Glenn Morris <rgm@gnu.org>
Date: Fri, 2 Oct 2020 16:38:24 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~5761
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=726eb835ddcbc209545f681d7272ebaa13788b33;p=emacs.git

Merge from origin/emacs-27

78eacf31e8 ; Fix many typos in symbols in docs and comments
d5d12707d6 * doc/misc/flymake.texi (Using Flymake): Fix a typo.  (Bug...

# Conflicts:
#	lisp/allout.el
#	lisp/progmodes/ebrowse.el
---

726eb835ddcbc209545f681d7272ebaa13788b33
diff --cc lisp/progmodes/ebrowse.el
index 1c9e805f039,c84803a3fab..ffd7d03d7a9
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@@ -3543,9 -3615,9 +3543,9 @@@ completion.
  
  ;;; Tags query replace & search
  
 -(defvar ebrowse-tags-loop-form ()
 -  "Form for `ebrowse-tags-loop-continue'.
 -Evaluated for each file in the tree.  If it returns nil, proceed
 +(defvar ebrowse-tags-loop-call '(ignore)
-   "Function call for `ebrowse-loop-continue'.
++  "Function call for `ebrowse-tags-loop-continue'.
 +Passed to `apply' for each file in the tree.  If it returns nil, proceed
  with the next file.")
  
  (defvar ebrowse-tags-next-file-list ()