aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f5c0e44550..ef85ffab8a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-08-01 Deniz Dogan <deniz@dogan.se>
2
3 * net/rcirc.el (rcirc-handler-333): Clarify docstring.
4
12011-07-30 Michael Albinus <michael.albinus@gmx.de> 52011-07-30 Michael Albinus <michael.albinus@gmx.de>
2 6
3 Sync with Tramp 2.2.2. 7 Sync with Tramp 2.2.2.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9e04abb8cd5..7d43c4f7547 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2695,7 +2695,8 @@ the only argument."
2695 (setq rcirc-topic (caddr args))))) 2695 (setq rcirc-topic (caddr args)))))
2696 2696
2697(defun rcirc-handler-333 (process sender args text) 2697(defun rcirc-handler-333 (process sender args text)
2698 "Not in rfc1459.txt" 2698 "333 says who set the topic and when.
2699Not in rfc1459.txt"
2699 (let ((buffer (or (rcirc-get-buffer process (cadr args)) 2700 (let ((buffer (or (rcirc-get-buffer process (cadr args))
2700 (rcirc-get-temp-buffer-create process (cadr args))))) 2701 (rcirc-get-temp-buffer-create process (cadr args)))))
2701 (with-current-buffer buffer 2702 (with-current-buffer buffer