Glenn Morris 3ee1841f28 Merge from origin/emacs-26 ... b98cf9c ; Fix a typo in the Emacs manual 700fcd7 * doc/emacs/help.texi: Fix paren typo. c9c0e40 More minor changes in shell-related nodes of Emacs manual e6bf19c Fix inaccuracies in "Shell Ring" node of Emacs manual 087681b8 Improve documentation of kmacro commands and variables. be2e8cb * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon. 1d9e66a Don't check non-X frames for z order (Bug#31373) 7dc028e Check NSWindow is actually a frame Conflicts: src/nsfns.m		2018-05-15 09:09:48 -07:00
..
emacs	Merge from origin/emacs-26	2018-05-15 09:09:48 -07:00
lispintro	* lisp/subr.el (dotimes): Deprecate RESULT field. (Bug#16206)	2018-04-28 23:20:33 +03:00
lispref	Improve documentation for "other window" scrolling	2018-05-10 19:04:11 -04:00
man	Merge from origin/emacs-26	2018-05-15 09:09:48 -07:00
misc	Remove obsolete objects from dired-x.el	2018-05-14 17:06:33 +02:00