diff options
| author | Paul Eggert | 2016-06-26 00:16:25 +0200 |
|---|---|---|
| committer | Paul Eggert | 2016-06-26 00:16:25 +0200 |
| commit | fdcf46d33eebc59e56a35fcea186c61aad3c81d0 (patch) | |
| tree | 8db131d7f52ead80ee12e52c3236510f71b31b48 /etc | |
| parent | d6930356cabd3036e445cc6a2f668b1fd3e0cde4 (diff) | |
| parent | 0377fe2b819bb93ac7dc314c8dbd99304d8b98d0 (diff) | |
| download | emacs-fdcf46d33eebc59e56a35fcea186c61aad3c81d0.tar.gz emacs-fdcf46d33eebc59e56a35fcea186c61aad3c81d0.zip | |
Merge from origin/emacs-25
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/AUTHORS b/etc/AUTHORS index 9a4aaf6d554..dc5a28eac4c 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS | |||
| @@ -3682,7 +3682,7 @@ Prestoo Ten: changed screen.el | |||
| 3682 | 3682 | ||
| 3683 | Primoz Peterlin: changed TUTORIAL.sl | 3683 | Primoz Peterlin: changed TUTORIAL.sl |
| 3684 | 3684 | ||
| 3685 | Przemyslaw Wojnowski: changed cl-lib-tests.el | 3685 | Przemysław Wojnowski: changed cl-lib-tests.el |
| 3686 | 3686 | ||
| 3687 | Przemysław Wojnowski: wrote obarray-tests.el sgml-mode-tests.el | 3687 | Przemysław Wojnowski: wrote obarray-tests.el sgml-mode-tests.el |
| 3688 | and changed obarray.el sgml-mode.el | 3688 | and changed obarray.el sgml-mode.el |