diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
| commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
| tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc /lisp/erc/erc.el | |
| parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
| parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
| download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index d0b511dc0a2..1044acff8d5 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1,6 +1,6 @@ ;; erc.el --- An Emacs Internet Relay Chat client -*- lexical-binding:t -*- -;; Copyright (C) 1997-2020 Free Software Foundation, Inc. +;; Copyright (C) 1997-2021 Free Software Foundation, Inc. ;; Author: Alexander L. Belikoff (alexander@belikoff.net) ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), @@ -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) |