diff options
| author | Leo Liu | 2019-10-07 18:52:33 +0800 |
|---|---|---|
| committer | Leo Liu | 2019-10-07 18:52:33 +0800 |
| commit | 55dcd32ad2209dc34bfb6b713bf73be9bf4c4cb2 (patch) | |
| tree | ca6e3da88abe262789ad53a53065e6b423416fb3 | |
| parent | bd0f173199c112b2b146e727f80e973e7fc12143 (diff) | |
| download | emacs-55dcd32ad2209dc34bfb6b713bf73be9bf4c4cb2.tar.gz emacs-55dcd32ad2209dc34bfb6b713bf73be9bf4c4cb2.zip | |
Fix rcirc not to interpret nil as nickname (bug#37344)
* lisp/net/rcirc.el (rcirc-send-privmsg): Type check `target'.
(rcirc-cmd-me): Send CTCP only when `target' exists.
| -rw-r--r-- | lisp/net/rcirc.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index de524d9ef10..d95db26cae9 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -825,6 +825,7 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") | |||
| 825 | (process-send-string process string))) | 825 | (process-send-string process string))) |
| 826 | 826 | ||
| 827 | (defun rcirc-send-privmsg (process target string) | 827 | (defun rcirc-send-privmsg (process target string) |
| 828 | (cl-check-type target string) | ||
| 828 | (rcirc-send-string process (format "PRIVMSG %s :%s" target string))) | 829 | (rcirc-send-string process (format "PRIVMSG %s :%s" target string))) |
| 829 | 830 | ||
| 830 | (defun rcirc-send-ctcp (process target request &optional args) | 831 | (defun rcirc-send-ctcp (process target request &optional args) |
| @@ -2337,8 +2338,8 @@ With a prefix arg, prompt for new topic." | |||
| 2337 | (let ((timestamp (format-time-string "%s"))) | 2338 | (let ((timestamp (format-time-string "%s"))) |
| 2338 | (rcirc-send-ctcp process target "PING" timestamp))) | 2339 | (rcirc-send-ctcp process target "PING" timestamp))) |
| 2339 | 2340 | ||
| 2340 | (defun rcirc-cmd-me (args &optional process target) | 2341 | (defun rcirc-cmd-me (args process target) |
| 2341 | (rcirc-send-ctcp process target "ACTION" args)) | 2342 | (when target (rcirc-send-ctcp process target "ACTION" args))) |
| 2342 | 2343 | ||
| 2343 | (defun rcirc-add-or-remove (set &rest elements) | 2344 | (defun rcirc-add-or-remove (set &rest elements) |
| 2344 | (dolist (elt elements) | 2345 | (dolist (elt elements) |