From: Glenn Morris <rgm@gnu.org>
Date: Thu, 22 Feb 2018 17:27:21 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5643
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bfb754c3ee2e0d667d36fb4300e2880715ea895;p=emacs.git

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
---

6bfb754c3ee2e0d667d36fb4300e2880715ea895