[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 74f022b2797 2/6: ; Make erc--send-input-lines a normal function a
From: |
F. Jason Park |
Subject: |
master 74f022b2797 2/6: ; Make erc--send-input-lines a normal function again |
Date: |
Sun, 7 Jan 2024 18:17:15 -0500 (EST) |
branch: master
commit 74f022b2797567ab04405af37b877d94cc4fdca2
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>
; 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.
---
lisp/erc/erc.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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")
- master updated (18de131222e -> 50f430ebcd8), F. Jason Park, 2024/01/07
- master 50f430ebcd8 6/6: Clarify purpose of module aliases in ERC, F. Jason Park, 2024/01/07
- master 94f760163e2 1/6: ; doc/misc/erc.texi: Improve SASL intro., F. Jason Park, 2024/01/07
- master fad2d1e2acc 3/6: Use global window hook for erc-keep-place-indicator, F. Jason Park, 2024/01/07
- master d6f9379d1c7 4/6: Allow setting `erc-split-line-length' to zero, F. Jason Park, 2024/01/07
- master 37e87bc3eeb 5/6: Make ERC's format catalogs more extensible, F. Jason Park, 2024/01/07
- master 74f022b2797 2/6: ; Make erc--send-input-lines a normal function again,
F. Jason Park <=