]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jan 2021 09:14:58 +0000 (01:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jan 2021 09:14:58 +0000 (01:14 -0800)
74a77ef299 Improve documentation of 'network-lookup-address-info'
c6d5555646 Display messages sent using ERC's /say
c156723769 Fix Rmail summary display when From: header is malformed

1  2 
doc/lispref/processes.texi
lisp/erc/erc.el
lisp/mail/rmailsum.el
src/process.c

Simple merge
diff --cc lisp/erc/erc.el
Simple merge
Simple merge
diff --cc src/process.c
Simple merge