• Glenn Morris's avatar
    Merge from origin/emacs-26 · 42a851c6
    Glenn Morris authored
    ca3f0a83 ; * etc/NEWS: Belated announcement of 2 changes made in Emacs...
    99f92dab Improve documentation of 'directory-files-and-attributes'
    df8649ac * lisp/gnus/message.el (message-remove-header): Don't remove ...
    b682a7e5 ; * etc/NEWS: Add headings for Emacs 26.2
    aa175a40 Adapt hexl-mode to native line-number display
    b8e7749b Fix example in Tramp manual
    f212fe51 Handle case where Xft is found but not XRender
    186280fb * doc/misc/tramp.texi (Frequently Asked Questions): Adapt zsh...
    24ba6331 Improve read-multiple-choice docstring (Bug#31628)
    
    Conflicts:
    	etc/NEWS
    	src/dired.c
    42a851c6