From: F. Jason Park <jp@neverwas.me>
Date: Mon, 1 Jan 2024 08:34:53 +0000 (-0800)
Subject: ; Make erc--send-input-lines a normal function again
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a36f28f634310c982bf4a24bf92aa1fdf25b5f5;p=emacs.git

; Make erc--send-input-lines a normal function again

* lisp/erc/erc.el (erc--send-input-lines): Revert portion of
174b3dd9bd78c662ce9fff78404dcfa02259d21b "Make nested input handling
more robust in ERC" that converted this from a function to a method.
Instead, defer change until it's needed, likely for bug#49860.  Also,
don't inadvertently allow overloading of `insertp' because user code
can legitimately set that to a function, which we then blindly call.
Instead, hard-code it to the only expected alternate display function.

(cherry picked from commit 74f022b2797567ab04405af37b877d94cc4fdca2)
---

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e639a6278fc..b73e80cedde 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -7878,12 +7878,13 @@ queue.  Expect LINES-OBJ to be an `erc--input-split' object."
     (user-error "Multiline command detected" ))
   lines-obj)
 
-(cl-defmethod erc--send-input-lines (lines-obj)
+(defun erc--send-input-lines (lines-obj)
   "Send lines in `erc--input-split-lines' object LINES-OBJ."
   (when (erc--input-split-sendp lines-obj)
     (dolist (line (erc--input-split-lines lines-obj))
       (when (erc--input-split-insertp lines-obj)
-        (if (functionp (erc--input-split-insertp lines-obj))
+        (if (eq (erc--input-split-insertp lines-obj)
+                'erc--command-indicator-display)
             (funcall (erc--input-split-insertp lines-obj) line)
           (erc-display-msg line)))
       (erc-process-input-line (concat line "\n")