Glenn Morris 433b6a74ec Merge from origin/emacs-26 ... 82c82b1 (origin/emacs-26) In user manual fix value of default frame h... 2e8825d Improve documentation of 'file-local-name' and related APIs 11f0635 ; Remove comment in esh-proc.el # Conflicts: # lisp/simple.el		2018-12-30 17:02:40 -08:00
..
emacs	Merge from origin/emacs-26	2018-12-30 17:02:40 -08:00
lispintro	Merge from origin/emacs-26	2018-12-20 07:51:15 -08:00
lispref	Merge from origin/emacs-26	2018-12-30 17:02:40 -08:00
man	Add support in emacsclient for EMACS_SOCKET_NAME	2018-10-27 12:18:27 +03:00
misc	Bump Tramp version to 2.4.1	2018-12-27 12:24:24 +01:00