Merge from origin/emacs-26
commitf069ea4f84a94bfbbd444073729f81fdd27c9445
authorGlenn Morris <rgm@gnu.org>
Thu, 30 Nov 2017 01:12:56 +0000 (29 17:12 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 30 Nov 2017 01:12:56 +0000 (29 17:12 -0800)
tree6adf14a7d71264bb20c87a426df6e18e0edba9a3
parent03e1012be4028e653bd88c93846b17172b5c0faa
parent408862f02a874dcd9cfc2599adb35dec522b3ef4
Merge from origin/emacs-26

408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m...
9964db4c34 Restore obsolete method of changing byte-compile-dest-file
3dd25aeecb Some minor Tramp corrections
d670a15f25 * doc/misc/url.texi (http/https): Fix typo
99d07e8d5e Remove some bogus definition-prefixes from loaddefs
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
0540df10e6 Update documentation of '.dir-locals-2.el'
f2441ab320 ; Fix some tiny doc and comment typos
22ff46e6d8 ; Fix some comment typos

# Conflicts:
# etc/NEWS
etc/NEWS.26
lisp/files.el
lisp/gnus/gnus-cus.el
lisp/gnus/message.el
lisp/net/tramp.el
lisp/progmodes/ebnf2ps.el
lisp/progmodes/flymake.el
lisp/vc/vc-git.el
test/lisp/net/tramp-tests.el