diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:14:58 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:14:58 -0800 |
| commit | 8bc552ffa53936f9fa1517c30d5057be80d09ca4 (patch) | |
| tree | 29097047634cc76f1b3aea76a15334d8bf156f5d /lisp/mail/rmailsum.el | |
| parent | ba05d005e5a81bc123ad8da928b1bccb6b160e7a (diff) | |
| parent | 74a77ef299f3703b8b9eac7579af6b924de1c3e8 (diff) | |
| download | emacs-8bc552ffa53936f9fa1517c30d5057be80d09ca4.tar.gz emacs-8bc552ffa53936f9fa1517c30d5057be80d09ca4.tar.bz2 emacs-8bc552ffa53936f9fa1517c30d5057be80d09ca4.zip | |
Merge from origin/emacs-27
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
Diffstat (limited to 'lisp/mail/rmailsum.el')
| -rw-r--r-- | lisp/mail/rmailsum.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index f09cd0e0abb..60b67edf85a 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -786,6 +786,11 @@ the message being processed." ;; To: =?UTF-8?Q?=C5=A0t=C4=9Bp=C3=A1n_?= =?UTF-8?Q?N=C4=9Bmec?= ;; <stepnem@gmail.com> (setq from (rfc2047-decode-string from)) + ;; We cannot tolerate any leftover newlines in From, + ;; as that disrupts the rmail-summary display. + ;; Newlines can be left in From if it was malformed, + ;; e.g. had unbalanced quotes. + (setq from (replace-regexp-in-string "\n+" " " from)) (setq len (length from)) (setq mch (string-match "[@%]" from)) (format "%25s" |