mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-06 11:50:51 -08:00
Allow spoofing process marker in erc-display-line-1
* lisp/erc/erc.el (erc--insert-marker): New internal variable for overriding `erc-insert-marker' when displaying messages at a non-default location in the buffer. (erc-display-line-1): Favor `erc--insert-marker' over `erc-insert-marker' when non-nil. ; * test/lisp/erc/resources/base/assoc/multi-net/barnet.eld: Timeouts. ; * test/lisp/erc/resources/base/assoc/multi-net/foonet.eld: Timeouts. ; * test/lisp/erc/resources/base/netid/bouncer/barnet-drop.eld: Timeouts. ; * test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld: Timeouts. ; * test/lisp/erc/resources/erc-d/resources/dynamic-foonet.eld: Timeouts. ; * test/lisp/erc/resources/sasl/scram-sha-1.eld: Timeouts. ; * test/lisp/erc/resources/sasl/scram-sha-256.eld: Timeouts.
This commit is contained in:
F. Jason Park
parent
d46c016fbd
commit
1950ddebac
8 changed files with 27 additions and 21 deletions
|
|
@ -2925,6 +2925,9 @@ this option to nil."
|
|||
(delete-region (point) (1- erc-input-marker))))
|
||||
(run-hooks 'erc--refresh-prompt-hook)))
|
||||
|
||||
(defvar erc--insert-marker nil
|
||||
"Internal override for `erc-insert-marker'.")
|
||||
|
||||
(defun erc-display-line-1 (string buffer)
|
||||
"Display STRING in `erc-mode' BUFFER.
|
||||
Auxiliary function used in `erc-display-line'. The line gets filtered to
|
||||
|
|
@ -2948,6 +2951,8 @@ If STRING is nil, the function does nothing."
|
|||
(format "%s" buffer)))
|
||||
(setq erc-insert-this t)
|
||||
(run-hook-with-args 'erc-insert-pre-hook string)
|
||||
(setq insert-position (marker-position (or erc--insert-marker
|
||||
erc-insert-marker)))
|
||||
(if (null erc-insert-this)
|
||||
;; Leave erc-insert-this set to t as much as possible. Fran
|
||||
;; Litterio <franl> has seen erc-insert-this set to nil while
|
||||
|
|
@ -2970,7 +2975,8 @@ If STRING is nil, the function does nothing."
|
|||
'(erc-parsed nil))))
|
||||
(erc--refresh-prompt)))))
|
||||
(run-hooks 'erc-insert-done-hook)
|
||||
(erc-update-undo-list (- (or (marker-position erc-insert-marker)
|
||||
(erc-update-undo-list (- (or (marker-position (or erc--insert-marker
|
||||
erc-insert-marker))
|
||||
(point-max))
|
||||
insert-position))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- mode: lisp-data; -*-
|
||||
((pass 1 "PASS :changeme"))
|
||||
((nick 1 "NICK tester"))
|
||||
((user 1 "USER user 0 * :tester")
|
||||
((pass 10 "PASS :changeme"))
|
||||
((nick 10 "NICK tester"))
|
||||
((user 10 "USER user 0 * :tester")
|
||||
(0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester")
|
||||
(0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16")
|
||||
(0 ":irc.barnet.org 003 tester :This server was created Tue, 04 May 2021 05:06:19 UTC")
|
||||
|
|
@ -18,16 +18,16 @@
|
|||
(0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3")
|
||||
(0 ":irc.barnet.org 422 tester :MOTD File is missing"))
|
||||
|
||||
((mode-user 8 "MODE tester +i")
|
||||
((mode-user 10 "MODE tester +i")
|
||||
(0 ":irc.barnet.org 221 tester +i")
|
||||
(0 ":irc.barnet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect."))
|
||||
|
||||
((join 2 "JOIN #chan")
|
||||
((join 10 "JOIN #chan")
|
||||
(0 ":tester!~u@jnu48g2wrycbw.irc JOIN #chan")
|
||||
(0 ":irc.barnet.org 353 tester = #chan :@mike joe tester")
|
||||
(0 ":irc.barnet.org 366 tester #chan :End of NAMES list"))
|
||||
|
||||
((mode 2 "MODE #chan")
|
||||
((mode 10 "MODE #chan")
|
||||
(0 ":irc.barnet.org 324 tester #chan +nt")
|
||||
(0 ":irc.barnet.org 329 tester #chan 1620104779")
|
||||
(0.1 ":mike!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :tester, welcome!")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- mode: lisp-data; -*-
|
||||
((pass 1 "PASS :changeme"))
|
||||
((nick 1 "NICK tester"))
|
||||
((user 1 "USER user 0 * :tester")
|
||||
((pass 10 "PASS :changeme"))
|
||||
((nick 10 "NICK tester"))
|
||||
((user 10 "USER user 0 * :tester")
|
||||
(0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester")
|
||||
(0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16")
|
||||
(0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC")
|
||||
|
|
@ -18,16 +18,16 @@
|
|||
(0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3")
|
||||
(0 ":irc.foonet.org 422 tester :MOTD File is missing"))
|
||||
|
||||
((mode-user 8 "MODE tester +i")
|
||||
((mode-user 10 "MODE tester +i")
|
||||
(0 ":irc.foonet.org 221 tester +i")
|
||||
(0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect."))
|
||||
|
||||
((join 2 "JOIN #chan")
|
||||
((join 10 "JOIN #chan")
|
||||
(0 ":tester!~u@9g6b728983yd2.irc JOIN #chan")
|
||||
(0 ":irc.foonet.org 353 tester = #chan :alice tester @bob")
|
||||
(0 ":irc.foonet.org 366 tester #chan :End of NAMES list"))
|
||||
|
||||
((mode 2 "MODE #chan")
|
||||
((mode 10 "MODE #chan")
|
||||
(0 ":irc.foonet.org 324 tester #chan +nt")
|
||||
(0 ":irc.foonet.org 329 tester #chan 1620104779")
|
||||
(0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!")
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
(0 ":irc.znc.in 306 tester :You have been marked as being away")
|
||||
(0 ":irc.barnet.org 305 tester :You are no longer marked as being away"))
|
||||
|
||||
((join 1 "JOIN #chan")
|
||||
((join 10 "JOIN #chan")
|
||||
(0 ":tester!~u@awyxgybtkx7uq.irc JOIN #chan")
|
||||
(0 ":irc.barnet.org 353 tester = #chan :@joe mike tester")
|
||||
(0 ":irc.barnet.org 366 tester #chan :End of NAMES list")
|
||||
(0.1 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :tester, welcome!")
|
||||
(0 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :tester, welcome!"))
|
||||
|
||||
((mode 1 "MODE #chan")
|
||||
((mode 10 "MODE #chan")
|
||||
(0 ":irc.barnet.org 324 tester #chan +nt")
|
||||
(0 ":irc.barnet.org 329 tester #chan 1620805269")
|
||||
(0.1 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: But you have outfaced them all.")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- mode: lisp-data; -*-
|
||||
((pass 1 "PASS :foonet:changeme"))
|
||||
((pass 10 "PASS :foonet:changeme"))
|
||||
((nick 1 "NICK tester"))
|
||||
((user 1 "USER user 0 * :tester")
|
||||
(0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester")
|
||||
|
|
@ -22,14 +22,14 @@
|
|||
(0 ":irc.znc.in 306 tester :You have been marked as being away")
|
||||
(0 ":irc.foonet.org 305 tester :You are no longer marked as being away"))
|
||||
|
||||
((join 1 "JOIN #chan")
|
||||
((join 10 "JOIN #chan")
|
||||
(0 ":tester!~u@ertp7idh9jtgi.irc JOIN #chan")
|
||||
(0 ":irc.foonet.org 353 tester = #chan :@alice bob tester")
|
||||
(0 ":irc.foonet.org 366 tester #chan :End of NAMES list")
|
||||
(0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :tester, welcome!")
|
||||
(0 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :tester, welcome!"))
|
||||
|
||||
((mode 1 "MODE #chan")
|
||||
((mode 10 "MODE #chan")
|
||||
(0 ":irc.foonet.org 324 tester #chan +nt")
|
||||
(0 ":irc.foonet.org 329 tester #chan 1620805271")
|
||||
(0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: He cannot be heard of. Out of doubt he is transported.")
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
(0 ":irc.foonet.org 353 alice = #chan :+alice!~alice@example.com @%+bob!~bob@example.org")
|
||||
(0 ":irc.foonet.org 366 alice #chan :End of NAMES list"))
|
||||
|
||||
((mode 2 "MODE #chan")
|
||||
((mode 3 "MODE #chan")
|
||||
(0 ":irc.foonet.org 324 tester #chan +nt")
|
||||
(0 ":irc.foonet.org 329 tester #chan 1620805269")
|
||||
(0.1 ":alice!~u@awyxgybtkx7uq.irc PRIVMSG #chan :bob: Yes, a dozen; and as many to the vantage, as would store the world they played for.")
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@
|
|||
(0 ":jaguar.test 372 jilles : ~~ or rkpryyrag gb rnpu bgure ~~")
|
||||
(0 ":jaguar.test 376 jilles :End of message of the day."))
|
||||
|
||||
((mode-user 1.2 "MODE jilles +i")
|
||||
((mode-user 10 "MODE jilles +i")
|
||||
(0 ":jilles!~jilles@127.0.0.1 MODE jilles :+ri")
|
||||
(0 ":jaguar.test 306 jilles :You have been marked as being away"))
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@
|
|||
(0 ":jaguar.test 372 jilles : ~~ or rkpryyrag gb rnpu bgure ~~")
|
||||
(0 ":jaguar.test 376 jilles :End of message of the day."))
|
||||
|
||||
((mode-user 1.2 "MODE jilles +i")
|
||||
((mode-user 10 "MODE jilles +i")
|
||||
(0 ":jilles!~jilles@127.0.0.1 MODE jilles :+ri")
|
||||
(0 ":jaguar.test 306 jilles :You have been marked as being away"))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue