emacs/test/lisp/emulation, branch feature/auth-source-pass Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-25 2017-01-01T09:10:47+00:00 Paul Eggert 2017-01-01T09:10:47+00:00 bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Spelling and minor grammar fixes 2016-08-05T20:35:13+00:00 Paul Eggert 2016-08-05T20:31:10+00:00 92e5b41c7c5898820356fc66456804a45bbe7852 * test/file-organization.org: Rename from test/file-organisation.org. 
* test/file-organization.org: Rename from test/file-organisation.org.
Merge from origin/emacs-25 2016-06-25T22:16:25+00:00 Paul Eggert 2016-06-25T22:16:25+00:00 fdcf46d33eebc59e56a35fcea186c61aad3c81d0 0377fe2 ; Spelling fixes f253695 Update docs for `customize-mode' 4395aaa Fix documentation of 'assoc-string' and 'compare-strings' ab0ebb9 ; Only load .elc file in tests. a98aa02 Error on multibyte characters in HTTP request ea512a7 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys th... 8297331 ; Revert "Ensure undo-boundary after insert-file-contents." dc5e65b Unset GIT_DIR when calling Git commands 6cdd8f7 Ensure undo-boundary after insert-file-contents. 4793f5f Clarify documentation of 'line-spacing' and 'line-height' 5f37572 Fix removal of variables from process-environment e5e886d * admin/authors.el (authors-ignored-files, authors-valid-file... db0777b * admin/authors.el (authors-aliases, authors-fixed-case): Add... # Conflicts: # doc/lispref/modes.texi # lisp/gnus/mm-decode.el 
0377fe2 ; Spelling fixes
f253695 Update docs for `customize-mode'
4395aaa Fix documentation of 'assoc-string' and 'compare-strings'
ab0ebb9 ; Only load .elc file in tests.
a98aa02 Error on multibyte characters in HTTP request
ea512a7 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys th...
8297331 ; Revert "Ensure undo-boundary after insert-file-contents."
dc5e65b Unset GIT_DIR when calling Git commands
6cdd8f7 Ensure undo-boundary after insert-file-contents.
4793f5f Clarify documentation of 'line-spacing' and 'line-height'
5f37572 Fix removal of variables from process-environment
e5e886d * admin/authors.el (authors-ignored-files, authors-valid-file...
db0777b * admin/authors.el (authors-aliases, authors-fixed-case): Add...

# Conflicts:
#	doc/lispref/modes.texi
#	lisp/gnus/mm-decode.el
Merge from origin/emacs-25 2016-06-07T16:34:27+00:00 Paul Eggert 2016-06-07T16:34:27+00:00 5feeead12693cd97c6d77b14ef05d29ba5cf18bb 604f656 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del... 20eb531 * lisp/mail/footnote.el (footnote-mode): Fix doc typo. a7a2244 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo. 07bd972 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix... 
604f656 * test/automated/viper-tests.el (viper-test-undo-kmacro): Del...
20eb531 * lisp/mail/footnote.el (footnote-mode): Fix doc typo.
a7a2244 * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo.
07bd972 * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): Fix...
Merge from origin/emacs-25 2016-05-31T15:07:41+00:00 Paul Eggert 2016-05-31T15:07:41+00:00 25cc0f2aada3e321e5f1c6d1e492a93d16da45b2 788c9b6 ; Spelling fix 25c4a30 * lisp/recentf.el (recentf-dialog-mode-map): Remove follow-li... 0992ec3 Correct cl-flet usage (Bug#22317) 50caae3 Release MH-E manual version 8.6 602bb40 Update MH-E's documentation about HTML renderers 89018f0 Fx the we->the typo 845ee57 Restore frames into the current display by default ee28b4c * lisp/recentf.el (recentf-open-files-item): Quick fix for (b... 01c3cd1 etc/TODO: Remove out-of-place issue 5e18486 Clarify doc string of 'file-name-sans-extension' bffda22 Fix the MSDOS build f907f98 * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Ca... 1a2ffd0 * src/dired.c (Ffile_name_all_completions): Doc fix. (Bug#23... f7ffc4b Fix infloop in 'number-sequence' 4ab2673 ; Spelling and punctuation fixes in comments 71c152e * lisp/emacs-lisp/find-func.el (find-function-library): 
788c9b6 ; Spelling fix
25c4a30 * lisp/recentf.el (recentf-dialog-mode-map): Remove follow-li...
0992ec3 Correct cl-flet usage (Bug#22317)
50caae3 Release MH-E manual version 8.6
602bb40 Update MH-E's documentation about HTML renderers
89018f0 Fx the we->the typo
845ee57 Restore frames into the current display by default
ee28b4c * lisp/recentf.el (recentf-open-files-item): Quick fix for (b...
01c3cd1 etc/TODO: Remove out-of-place issue
5e18486 Clarify doc string of 'file-name-sans-extension'
bffda22 Fix the MSDOS build
f907f98 * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Ca...
1a2ffd0 * src/dired.c (Ffile_name_all_completions): Doc fix.  (Bug#23...
f7ffc4b Fix infloop in 'number-sequence'
4ab2673 ; Spelling and punctuation fixes in comments
71c152e * lisp/emacs-lisp/find-func.el (find-function-library):
Repair damage from emacs-25 merge 2016-05-26T20:20:02+00:00 Paul Eggert 2016-05-26T20:02:07+00:00 6ca36676c96954466bc0f1266115dff641697424 * test/lisp/character-fold-tests.el: Remove, as it was renamed to test/lisp/char-fold-tests.el. * test/lisp/emulation/viper-tests.el: Rename from test/automated/viper-tests.el. 
* test/lisp/character-fold-tests.el:
Remove, as it was renamed to test/lisp/char-fold-tests.el.
* test/lisp/emulation/viper-tests.el:
Rename from test/automated/viper-tests.el.