Merge from origin/emacs-26

ca3f0a8 ; * etc/NEWS: Belated announcement of 2 changes made in Emacs...
99f92da Improve documentation of 'directory-files-and-attributes'
df8649a * lisp/gnus/message.el (message-remove-header): Don't remove ...
b682a7e ; * etc/NEWS: Add headings for Emacs 26.2
aa175a4 Adapt hexl-mode to native line-number display
b8e7749 Fix example in Tramp manual
f212fe5 Handle case where Xft is found but not XRender
186280f * doc/misc/tramp.texi (Frequently Asked Questions): Adapt zsh...
24ba633 Improve read-multiple-choice docstring (Bug#31628)

Conflicts:
	etc/NEWS
	src/dired.c

1 files changed, 45 insertions, 0 deletions

diff --git a/etc/NEWS.26 b/etc/NEWS.26
index 812394f11d8..6240b7da431 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -16,6 +16,51 @@ You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
 
+* Installation Changes in Emacs 26.2
+
+---
+** Building Emacs with the '--with-xwidgets' option now requires WebKit2
+To build Emacs with xwidgets support, you will need to install the
+webkit2gtk-4.0 package; version 2.12 or later is required.
+(This change was actually made in Emacs 26.1, but was not called out
+in its NEWS.)
+
+
+* Startup Changes in Emacs 26.2
+
+
+* Changes in Emacs 26.2
+
+
+* Editing Changes in Emacs 26.2
+
+
+* Changes in Specialized Modes and Packages in Emacs 26.2
+
+** Shell mode
+
+---
+*** Shell mode buffers now have 'scroll-conservatively' set to 101.
+This is so as to better emulate the scrolling behavior of a text
+terminal when new output is added to the screen buffer.  To get back
+the previous behavior, reset 'scroll-conservatively' to zero (or any
+other value you like) in a function and add it to 'shell-mode-hook'.
+(This change was actually made in Emacs 26.1, but was not called out
+in its NEWS.)
+
+
+* New Modes and Packages in Emacs 26.2
+
+
+* Incompatible Lisp Changes in Emacs 26.2
+
+
+* Lisp Changes in Emacs 26.2
+
+
+* Changes in Emacs 26.2 on Non-Free Operating Systems
+
+
 * Installation Changes in Emacs 26.1
 
 ** By default libgnutls is now required when building Emacs.