]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 5 Feb 2018 15:50:22 +0000 (07:50 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 5 Feb 2018 15:50:22 +0000 (07:50 -0800)
commita0c7157a16481b0523ad20cda9115f9435188f73
tree4e23a700da7c493f54f0afeb337fd963502115cb
parentc24c5dc4a4cc18e7f1ec949efcfe1d4bae541d02
parentc787a4968273027960a20ced6d63bae0d1ffa87e
Merge from origin/emacs-26

c787a49 (origin/emacs-26) * lisp/vc/vc-git.el (vc-git-print-log): Res...
b654791 * doc/emacs/misc.texi (Interactive Shell): Refer to node "Min...
f1102d2 Yet another round of fixing the Emacs manual
76b5a68 * etc/NEWS: Expunge the solecism "allow(s)" + infinitive
b4ff8cc Two minor fixes in Antinews
aafcd12 * etc/NEWS: Rename image-dired-thumb-job-limit
a893924 * lisp/simple.el (async-shell-command, shell-command): Fix gr...
699081f Fix deferred display of async shell-command buffers
d2d5e54 Mention remote file name completion in Emacs manual
f589f5a Yest another round of manual copyedits
1ed4089 Update xdisp.c commentary
e23de39 Fix Bug#30324
e1a9dc0 Recognize Org as builtin package (bug#30310)

Conflicts:
etc/NEWS
doc/emacs/dired.texi
etc/NEWS.26
lisp/simple.el
lisp/vc/vc-git.el
src/xdisp.c