Glenn Morris 42a851c634 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		2018-06-02 10:25:50 -07:00
..
emacs	Merge from origin/emacs-26	2018-05-25 09:45:34 -07:00
lispintro	Merge from origin/emacs-26	2018-05-25 09:45:34 -07:00
lispref	Merge from origin/emacs-26	2018-06-02 10:25:50 -07:00
man	Merge from origin/emacs-26	2018-05-15 09:09:48 -07:00
misc	Merge from origin/emacs-26	2018-06-02 10:25:50 -07:00