Paul Eggert 90f5282e20 Merge from origin/emacs-25 ... ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description. 2b774fa Mention "editor" in Emacs man page header ae60d0c Document problems with nerd-fonts 2fdb5a9 ; Details about pinning Emacs to w32 task bar 5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i... 4c51ef4 Clarify what is the "cursor" 8303c32 ; * etc/NEWS: Copyedits. 3f7493e ; Fix a typo in comment c54cf8d Improve commentary in lisp.h 8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro... 0ba9932 Disable native completion for ipython (Bug#25067) 38fc456 Fix a typo in ada-mode manual 00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d... a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-... # Conflicts: # etc/NEWS # etc/PROBLEMS		2017-03-19 12:34:03 -07:00
..
ChangeLog.1	Update copyright year to 2017	2016-12-31 19:42:26 -08:00
ctags.1	Nuke arch-tags.	2011-01-15 15:16:57 -08:00
ebrowse.1	Fix copyright years by hand	2017-01-01 04:01:41 +00:00
emacs.1.in	Merge from origin/emacs-25	2017-03-19 12:34:03 -07:00
emacsclient.1	* doc/man/emacsclient.1: Document +line:column option.	2016-03-29 14:20:12 -07:00
etags.1	Fix copyright years by hand	2017-01-01 04:01:41 +00:00