]> git.eshelyaron.com Git - emacs.git/commit
Merge from emacs-26
authorNoam Postavsky <npostavs@gmail.com>
Tue, 10 Jul 2018 00:06:27 +0000 (20:06 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Tue, 10 Jul 2018 00:06:27 +0000 (20:06 -0400)
commit6b8349a90274686d9cb67a2ffaac2d930d5f6b46
treed2fbc56f7a21120951cb0c14bbe349e388b35e62
parent6de90fb41b63d33457c1fa41cbb4bd8b25e4cc7f
parentdb3f7797809ed9de8dd92ce38bf34f768ddc64ad
Merge from emacs-26

db3f779780 ; Test for Bug#32014
90d95b000c Explicitly reject :server and :nowait (Bug#31903)
917158f8c9 Fix Bug#32090

# Conflicts:
# src/process.c
src/process.c