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/erc/erc.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/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 73ca53f5d8c..1044acff8d5 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2861,7 +2861,9 @@ need this when pasting multiple lines of text." (if (string-match "^\\s-*$" line) nil (string-match "^ ?\\(.*\\)" line) - (erc-process-input-line (match-string 1 line) nil t))) + (let ((msg (match-string 1 line))) + (erc-display-msg msg) + (erc-process-input-line msg nil t)))) (put 'erc-cmd-SAY 'do-not-parse-args t) (defun erc-cmd-SET (line) |