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

diff --cc lisp/allout.el
Simple merge

diff --cc lisp/calendar/calendar.el
Simple merge

diff --cc lisp/calendar/timeclock.el
Simple merge

diff --cc lisp/cedet/ede/detect.el
Simple merge

diff --cc lisp/doc-view.el
Simple merge

diff --cc lisp/emacs-lisp/eieio-base.el
Simple merge

diff --cc lisp/emacs-lisp/ert.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/emacs-lisp/re-builder.el
Simple merge

diff --cc lisp/erc/erc-track.el
Simple merge

diff --cc lisp/erc/erc.el
Simple merge

diff --cc lisp/eshell/esh-util.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/ffap.el
Simple merge

diff --cc lisp/filecache.el
Simple merge

diff --cc lisp/filesets.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/forms.el
Simple merge

diff --cc lisp/gnus/gnus-util.el
Simple merge

diff --cc lisp/gnus/message.el
Simple merge

diff --cc lisp/gnus/nndiary.el
Simple merge

diff --cc lisp/gnus/nnmaildir.el
Simple merge

diff --cc lisp/image-dired.el
Simple merge

diff --cc lisp/image.el
Simple merge

diff --cc lisp/jsonrpc.el
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/net/nsm.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/org/org.el
Simple merge

diff --cc lisp/printing.el
Simple merge

diff --cc lisp/progmodes/antlr-mode.el
Simple merge

diff --cc lisp/progmodes/ebrowse.el
index 1c9e805f039b0a505779689b9395fc253f7141b0,c84803a3fabcbd96e360577d0fc7388528b949cf..ffd7d03d7a94a6cd5475d9a8a49bb58331858987
--- 1/lisp/progmodes/ebrowse.el
--- 2/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@@ -3543,9 -3615,9 +3543,9 @@@ completion.
  \f
  ;;; 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 ()

diff --cc lisp/progmodes/flymake-cc.el
Simple merge

diff --cc lisp/progmodes/hideif.el
Simple merge

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc lisp/progmodes/sql.el
Simple merge

diff --cc lisp/ps-print.el
Simple merge

diff --cc lisp/ps-samp.el
Simple merge

diff --cc lisp/ses.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/strokes.el
Simple merge

diff --cc lisp/tempo.el
Simple merge

diff --cc lisp/textmodes/artist.el
Simple merge

diff --cc lisp/window.el
Simple merge

diff --cc test/lisp/electric-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/edebug-tests.el
Simple merge

diff --cc test/lisp/files-tests.el
Simple merge

diff --cc test/src/coding-tests.el
Simple merge