]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Wed, 3 Oct 2018 16:23:16 +0000 (09:23 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 3 Oct 2018 16:23:16 +0000 (09:23 -0700)
commit48adb87bcb0f27e2d18fc6523c472af4916d5884
tree0299f7ce336e0d21fe902af6809798e3bb2045a7
parent51f0cccdde9bd1679e20f35d30e39e872ce6513a
parent7296b6fbf27aeae76ea63ab2d9d9f2e46491b971
Merge from origin/emacs-26

7296b6f Improve cl-do, cl-do* docstrings
d416109 Avoid returning early in 'while-no-input' due to subprocesses
e8a4d94 Cleanup when opening a new terminal fails. (Bug#32794)

# Conflicts:
# etc/NEWS
etc/NEWS.26
lisp/emacs-lisp/cl-macs.el
lisp/subr.el
src/keyboard.c
src/term.c
src/termhooks.h
src/terminal.c