Merge from origin/emacs-26

83187cd (origin/emacs-26) Skip mouse-face overlap check when mouse-fa...
a6d8f2b Fix capitalization of "Mail-Followup-To"
f9640f9 * lisp/progmodes/grep.el (grep-compute-defaults):
3a26c8a Semantic manual fixes
106a9f6 More improvements in the Emacs manual
244db85 * doc/misc/viper.texi (File and Buffer Handling): Add missing...
f0d6a16 Fix documentation of 'x-underline-at-descent-line'
69a8f45 * lisp/textmodes/flyspell.el (flyspell-get-word): Doc fix.
05214c6 Correct variable markup in manuals
355c644 Improve the "Sending Mail" chapter of Emacs manual

Conflicts:
	src/nsterm.m
	src/w32term.c

2 files changed, 3 insertions, 1 deletions

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 14e251e0667..755c9c73d37 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -734,6 +734,8 @@ This function is called from `compilation-filter-hook'."
              (grep-use-null-device ,grep-use-null-device)
              (grep-find-command ,grep-find-command)
              (grep-find-template ,grep-find-template)
+             (grep-use-null-filename-separator
+              ,grep-use-null-filename-separator)
              (grep-find-use-xargs ,grep-find-use-xargs)
              (grep-highlight-matches ,grep-highlight-matches))))))
 
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index aaa8ebfd480..d87cb5e72ed 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1309,7 +1309,7 @@ that may be included as part of a word (see `ispell-dictionary-alist').
 
 This finds the word to spell-check by searching for CASECHARS defined
 in `ispell-dictionary-alist' for the current dictionary.  Thus, the
-word could be far away of point if point is inside whitespace or
+word could be far away from point if point is inside whitespace or
 punctuation characters, or in text that belongs to a different
 language."
   (let* ((flyspell-casechars (flyspell-get-casechars))