mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Avoid mutating default value of erc-server-last-peers

Browse source 
* lisp/erc/erc-backend.el (erc-server-last-peers): Leave default as
nil instead of a quoted constant.
(erc-server-connect): Initialize `erc-server-last-peers' to a new
value local to a server buffer.
(erc-message): Operate on server's local `erc-server-last-peers' value
instead of the global default.  Prefer replacing value instead of
mutating CDR to make for easier testing.
(erc-server-PRIVMSG): Create a new `erc-server-last-peers' for easier
testing. (Bug#56449)
This commit is contained in:
F. Jason Park 2022-07-06 00:40:42 -07:00
parent 075d6bb410
commit c238f568cd
2 changed files with 93 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/erc/erc-backend.el
View file

@ -230,7 +230,7 @@ current IRC process is still alive.")
(defvar-local erc-server-lines-sent nil
"Line counter.")
(defvar-local erc-server-last-peers '(nil . nil)
(defvar-local erc-server-last-peers nil
"Last peers used, both sender and receiver.
Those are used for /MSG destination shortcuts.")
@ -562,7 +562,7 @@ TLS (see `erc-session-client-certificate' for more details)."
(setq erc-server-last-received-time time))
(setq erc-server-lines-sent 0)
;; last peers (sender and receiver)
(setq erc-server-last-peers '(nil . nil)))
(setq erc-server-last-peers (cons nil nil)))
;; we do our own encoding and decoding
(when (fboundp 'set-process-coding-system)
(set-process-coding-system process 'raw-text))
@ -939,21 +939,20 @@ be used. If the target is \".\", the last person you've sent a message
to will be used."
(cond
((string-match "^\\s-*\\(\\S-+\\) ?\\(.*\\)" line)
(let ((tgt (match-string 1 line))
(s (match-string 2 line)))
(let* ((tgt (match-string 1 line))
(s (match-string 2 line))
(server-buffer (erc-server-buffer))
(peers (buffer-local-value 'erc-server-last-peers server-buffer)))
(erc-log (format "cmd: MSG(%s): [%s] %s" message-command tgt s))
(cond
((string= tgt ",")
(if (car erc-server-last-peers)
(setq tgt (car erc-server-last-peers))
(setq tgt nil)))
(setq tgt (car peers)))
((string= tgt ".")
(if (cdr erc-server-last-peers)
(setq tgt (cdr erc-server-last-peers))
(setq tgt nil))))
(setq tgt (cdr peers))))
(cond
(tgt
(setcdr erc-server-last-peers tgt)
(with-current-buffer server-buffer
(setq erc-server-last-peers (cons (car peers) tgt)))
(erc-server-send (format "%s %s :%s" message-command tgt s)
force))
(t
@ -1552,7 +1551,7 @@ add things to `%s' instead."
(erc-process-ctcp-reply proc parsed nick login host
(match-string 1 msg)))))
(t
(setcar erc-server-last-peers nick)
(setq erc-server-last-peers (cons nick (cdr erc-server-last-peers)))
(setq s (erc-format-privmessage
(or fnick nick) msg
;; If buffer is a query buffer,