aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-04-08 21:20:43 +0800
committerChong Yidong2012-04-08 21:20:43 +0800
commit5c14e333bc3bc62a082a1c04fd8eda8f6a4ac30a (patch)
treed9efd613f1356696d85dc255db79e656d6c74716
parent8fc85b2054579f268077be7b44f4b4eb6a43963a (diff)
downloademacs-5c14e333bc3bc62a082a1c04fd8eda8f6a4ac30a.tar.gz
emacs-5c14e333bc3bc62a082a1c04fd8eda8f6a4ac30a.zip
* lisp/net/rcirc.el (rcirc-cmd-quit): Revert 2012-03-18 change.
Fixes: debbugs:11192
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/rcirc.el18
2 files changed, 12 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 493a4334e6e..ae31c616772 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-04-08 Chong Yidong <cyd@gnu.org>
2
3 * net/rcirc.el (rcirc-cmd-quit): Revert 2012-03-18 change
4 (Bug#11192).
5
12012-04-07 Glenn Morris <rgm@gnu.org> 62012-04-07 Glenn Morris <rgm@gnu.org>
2 7
3 * pcmpl-rpm.el (pcomplete/rpm): Handle -qf. 8 * pcmpl-rpm.el (pcomplete/rpm): Handle -qf.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index d09b6aa831f..1c74e6190dc 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2165,17 +2165,13 @@ CHANNELS is a comma- or space-separated string of channel names."
2165 (let ((channel (if (> (length channel) 0) channel target))) 2165 (let ((channel (if (> (length channel) 0) channel target)))
2166 (rcirc-send-string process (concat "PART " channel " :" rcirc-id-string)))) 2166 (rcirc-send-string process (concat "PART " channel " :" rcirc-id-string))))
2167 2167
2168(defun-rcirc-command quit (reason all) 2168(defun-rcirc-command quit (reason)
2169 "Send a quit message to server with REASON. 2169 "Send a quit message to server with REASON."
2170When called with prefix, quit all servers." 2170 (interactive "sQuit reason: ")
2171 (interactive "sQuit reason: \nP") 2171 (rcirc-send-string process (concat "QUIT :"
2172 (dolist (p (if all 2172 (if (not (zerop (length reason)))
2173 (rcirc-process-list) 2173 reason
2174 (list process))) 2174 rcirc-id-string))))
2175 (rcirc-send-string p (concat "QUIT :"
2176 (if (not (zerop (length reason)))
2177 reason
2178 rcirc-id-string)))))
2179 2175
2180(defun-rcirc-command nick (nick) 2176(defun-rcirc-command nick (nick)
2181 "Change nick to NICK." 2177 "Change nick to NICK."