]> code.delx.au - gnu-emacs/commit
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2016 22:16:25 +0000 (00:16 +0200)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2016 22:16:25 +0000 (00:16 +0200)
commitfdcf46d33eebc59e56a35fcea186c61aad3c81d0
tree8db131d7f52ead80ee12e52c3236510f71b31b48
parentd6930356cabd3036e445cc6a2f668b1fd3e0cde4
parent0377fe2b819bb93ac7dc314c8dbd99304d8b98d0
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
doc/lispref/display.texi
doc/lispref/modes.texi
doc/lispref/strings.texi
lisp/cus-edit.el
lisp/gnus/mm-decode.el
lisp/url/url-http.el
lisp/vc/vc-git.el
src/callproc.c
src/fns.c
src/minibuf.c
test/lisp/emulation/viper-tests.el