]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Feb 2019 16:40:52 +0000 (08:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Feb 2019 16:40:52 +0000 (08:40 -0800)
commitb60761acfa3c0070efd53056040524f05b35c07f
tree5dd010859b95c60bdcd3623b5df4fa50f653dc9e
parent94245b9a790392768d47afc15ae278369307d663
parent7ba8f803983fce7896042289ca47b3de4df42bb7
Merge from origin/emacs-26

7ba8f80398 Avoid errors in 'rmail-get-new-mail'
9c8412a0b8 Fix process-contact bug with TCP connections

# Conflicts:
# src/process.c
lisp/mail/rmail.el
src/process.c