Glenn Morris 5fe9375a51 Merge from origin/emacs-26 ... 02bee78 Let dir locals for more specific modes override those from less b1235f9 Improve documentation of Hexl mode 32d1813 Fix description of (move-to-column <n> t) when column <n> is ... 0397b7c ; Fix smtpmail-stream-type docstring 7dab3ee Recognize single quote attribute values in nxml and sgml (Bug... e4cde42 Disable extra display of &#10; in nxml-mode (Bug#32897) ca14dd1 Fix nxml-get-inside (Bug#32003) e7ab351 Fix positioning client buffer as instructed by emacsclient # Conflicts: # lisp/files.el # lisp/textmodes/sgml-mode.el		2019-05-14 17:18:18 -07:00
..
emacs	Merge from origin/emacs-26	2019-05-14 17:18:18 -07:00
lispintro	Merge from origin/emacs-26	2019-03-09 10:07:46 -08:00
lispref	Merge from origin/emacs-26	2019-05-14 17:18:18 -07:00
man	Merge from origin/emacs-26	2018-12-31 17:57:29 -08:00
misc	* lisp/progmodes/flymake.el: Obsolete variable flymake-start-on-newline	2019-05-07 23:29:14 +03:00