Paul Eggert 6b780a2e97 Merge from origin/emacs-25 ... 9ba51ed Document buffer-swap-text+save-excursion interaction 452aa94 Fix eieio vs cl-generic incompatibilities found in Rudel (bug... 248d5dd Include cl-generic in package--builtin-versions (bug#22817) 8f5a8b6 Improve timing in `tramp-test29-environment-variables' 05ba7a0 Add test for handling environment variables in Tramp e393d4f * lisp/emacs-lisp/package.el (describe-package-1) (package-st... 5e38887 ; * lisp/net/tramp.el: Fix 2010-10-04 comment typo. (Bug#23913) 90f2169 ; Spelling fixes 069fc05 Improve documentation of search functions 0a0144a Delete environment variables in Tramp when needed f624671 Add "New in Emacs 25" section to the FAQ 658daf9 Fix 'vertical-motion' in non-interactive sessions 686b520 Fix memory leak in imagemagick-types 4069b71 Update ELisp manual to match 'string-collate-equalp' doc string 1b2d6a6 Clarify docstring of find-feature-regexp aac62a6 Add details to cl-lib defining macros' docstrings d6aa4da Clarify doc string of 'save-buffer' 03bcf11 Un-confuse doc string of 'string-collate-equalp' c53135b Clarify documentation of 'mouse-on-link-p' # Conflicts: # lisp/emacs-lisp/eieio-core.el		2016-08-05 14:09:08 -07:00
..
emacs	Merge from origin/emacs-25	2016-08-05 14:07:00 -07:00
lispintro	Fix cross-references between manuals	2016-05-24 21:24:45 +03:00
lispref	Merge from origin/emacs-25	2016-08-05 14:09:08 -07:00
man	* doc/man/emacsclient.1: Document +line:column option.	2016-03-29 14:20:12 -07:00
misc	Merge from origin/emacs-25	2016-08-05 14:09:08 -07:00