Merge from origin/emacs-26

fc5b8f1 Fix Bug#29149
5622b2e Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
4da8799 (emacs-26) Fix misbehavior when drawing three-pixel high hori...
1b082c8 MH-E: don't automatically download external-body parts
069f978 ; * lisp/emacs-lisp/byte-run.el: Fix a typo in a comment.
504a56c ; Fix last commit
a34e44e ; Fix last commit
a8892b4 Further fix for Bug#29291
d14923b Fix divider frame params on NS (bug#29352)
b2518ac Spelling fixes

# Conflicts:
#	etc/NEWS
#	test/lisp/net/tramp-tests.el

1 files changed, 2 insertions, 3 deletions

diff --git a/etc/NEWS.26 b/etc/NEWS.26
index f79c2cbc8ea..6da4ab93b13 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -1155,9 +1155,8 @@ branch-related commands on a keymap bound to 'B'.
 
 ---
 *** Opening a .h file will turn C or C++ mode depending on language used.
-This is done with the help of 'c-or-c++-mode' function which analyses
-contents of the buffer to determine whether it's a C or C++ source
-file.
+This is done with the help of the 'c-or-c++-mode' function, which
+analyzes buffer contents to infer whether it's a C or C++ source file.
 
 ---
 ** New option 'cpp-message-min-time-interval' to allow user control