Paul Eggert 99e20f105a Merge from origin/emacs-25 ... ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. ... 8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change. 93d8346 Improve indexing of 'man'		2016-12-07 12:41:05 -08:00
..
emacs	Merge from origin/emacs-25	2016-12-07 12:41:05 -08:00
lispintro	Obsolete calendar-load-hook in favor of eval-after-load	2016-12-03 19:22:37 -08:00
lispref	Merge from origin/emacs-25	2016-12-07 12:41:04 -08:00
man	* src/emacs.c (usage_message): Mention named daemon. (Bug#24949)	2016-11-15 18:21:06 -05:00
misc	Tweak recent flymake change	2016-12-05 20:11:01 -05:00