| commit | 6bfb754c3ee2e0d667d36fb4300e2880715ea895 | |
| author | Glenn Morris <rgm@gnu.org> | |
| Thu, 22 Feb 2018 17:27:21 +0000 (22 09:27 -0800) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Thu, 22 Feb 2018 17:27:21 +0000 (22 09:27 -0800) | ||
| tree | bfa882d420c6da5679f2c54d8d4d20dd1ebe6b2c | treesnapshot (tar.gz zip) |
| parent | cb55ccae8be946f1562d74718086a4c8c8308ee5 | commitdiff |
| parent | 83187cd900c799865c967620eef3b7c18f3d168f | commitdiff |
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
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