[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8ea63ec 4/4: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
master 8ea63ec 4/4: Merge from origin/emacs-26 |
Date: |
Sat, 26 Oct 2019 12:57:08 -0400 (EDT) |
branch: master
commit 8ea63ecdd9b76fbe074bcd6b97ee8400667455a4
Merge: 045bcdb 55dcd32
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
55dcd32 (origin/emacs-26) Fix rcirc not to interpret nil as nickname ...
---
lisp/net/rcirc.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 4a94afe..a373c7c 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -827,6 +827,7 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and
LINE.")
(process-send-string process string)))
(defun rcirc-send-privmsg (process target string)
+ (cl-check-type target string)
(rcirc-send-string process (format "PRIVMSG %s :%s" target string)))
(defun rcirc-send-ctcp (process target request &optional args)
@@ -2332,8 +2333,8 @@ With a prefix arg, prompt for new topic."
(let ((timestamp (format-time-string "%s")))
(rcirc-send-ctcp process target "PING" timestamp)))
-(defun rcirc-cmd-me (args &optional process target)
- (rcirc-send-ctcp process target "ACTION" args))
+(defun rcirc-cmd-me (args process target)
+ (when target (rcirc-send-ctcp process target "ACTION" args)))
(defun rcirc-add-or-remove (set &rest elements)
(dolist (elt elements)