# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   9yhkud2wk8eh4z9t
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk
# testament_sha1: dbf6e03535b76650439e85424d7dee67444fb100
# timestamp: 2009-12-29 02:19:26 +0100
# base_revision_id: address@hidden
#   k2uyvjstk4ukdlw1
# 
# Begin patch
=== modified file 'lisp/net/rcirc.el'
--- lisp/net/rcirc.el	2009-10-31 02:38:34 +0000
+++ lisp/net/rcirc.el	2009-12-29 01:18:59 +0000
@@ -2477,6 +2477,35 @@
 	(setq rcirc-nick-away-alist (cons (cons nick away-message)
 					  rcirc-nick-away-alist))))))
 
+(defun rcirc-handler-317 (process sender args text)
+  "RPL_WHOISIDLE"
+  (let* ((nickname (cadr args))
+         (idle-time (rcirc-format-seconds
+                     (string-to-number 
+                      (caddr args))))
+         (signon-time
+          (format-time-string "%c" (seconds-to-time
+                                    (string-to-number (cadddr args)))))
+         (result (format "%s has been idle for %s, signed on at %s"
+                         nickname
+                         idle-time
+                         signon-time)))
+    (rcirc-print process sender "317" nil result)))
+
+(defun rcirc-format-seconds (seconds)
+  "Given a number of seconds, returns a string representation of
+those seconds in hours, minutes and seconds."
+  (cond
+   ((> seconds most-positive-fixnum) "very long")
+   ((= seconds 0) "0s")
+   (t 
+     (let ((res (format-seconds "%hh %mm %ss" seconds)))
+       (while (string-match "\\<0[hms] ?" res)
+         (setq res (replace-match "" nil t res)))
+       (when (string-match " +$" res)
+         (setq res (replace-match "" nil t res)))
+       res))))
+
 (defun rcirc-handler-332 (process sender args text)
   "RPL_TOPIC"
   (let ((buffer (or (rcirc-get-buffer process (cadr args))

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXVAgdYAAi1/gGsQMgBWf//3
1ubYjr////BQBRhVvWg7G7dGNtjncJJE0AmQnlPUZMjEyaTamT0IaAAGnqepoElAJo0NBJkaQ0Gg
BoNAAAAAJTRCTKemUeiGoxMymjTQZPKGgA9Rpk00NDjJk0YhiaYCBgTTBGCYmmmgAwgkppEyNPUm
TJ6TT9Ig0aAABoAAAC4sSGHfc0FfT2HfOCqtBYiz5dk3yIn800FvHe0uKQGfQ9Hvi/6YwDa7HYYJ
sAkJMhCNba8KXVUKQpS6pmeUssoxYR5JybL1xMg/HlQlSnSWTsF50brzVNfdliw2Qd7zr7ol7lwx
LmfIHVSypSySLe0kSP3ZB7b9b+amokqmHxjd+DFju0ZJSbw2xZabKKEcMTrRoMnCbvpHSZvWLUjk
EadL86ojnQ8nEyNSNR6GC8tFfm4NkYEGUMzxOmct+WLGXKYW3VIbBUY10TxKaA3Z3EShKTV27HMi
xr7DEzn3UqgVSnRYrJLtLDTGtlXi5nGRCoyycdwTDEBi+TI47yE9SB0PTxz2q5YGFydXBsMNp4vB
zvXqvWAoSwiguhrG+wM9FcS/dGmsKjj29h3UCy4Vcnk1fkWthvRyupQpXLFTvxKVBzYHk7cIWR0t
IQTMk0WRnIHVrPk3Xb1EXBOs+No5PJcuO6uHQVb3ZaU1KVHKZDjintq1irQc5heUXAwaV0WYrL2S
ZC1+9WmwjcP0cWCY3zqO1Sz1aStGZ8sKXSYWj2zmasMEzjcWTkqETJQ2MyfAKA5jhT34Fr7rtgrd
SgmqKuaK9Ccmmd++pKhU5RcIrrZ6a3tgYvmqQ7SdkUUioKO1T9t2k5vFwbHJmIWf6VctlTNo4mrt
TMeH2OmX7kd7cbjxPwfsm8TcUTUm8y4otl8tx4URdbyg2ehKMgs7RdOkz9GeTWdvBROM1eYJM6X8
j7bFZ6o2SltssrQ8HyKR7JDuvq2wgKXmweS1hu7K0rXXMcaMlGxMezvHJsDh4r0pNCaWdu9IkwZl
pzU24izpfNUtTXp8ri4OHjY57Rvjxz8tgmxFCfyq6lLQSJEtMFEWNUtyaB0QQ4vTQaH5cxpm45m5
XUTByHLztgSL9ncVE6pv3OWxCr6OjKco1tbYbFFX1uZWwzRjNWNmykTZxr5JLcTPdVjlyzTKDIh/
ncZWOKSyceiUIZCJSZLWXFksx4yGtYDNq82jwsfrZ7mZ2rOmqIwuTBaBqRvSqUA4Qzs+UTuIKr1P
u87e8XlVlkLU4prMPWxe71L/booTdBhW2JWkqcSlUwFBELltnChjw59aeuGBKOQHzy/touAS5JlX
M5TqoWBSYApYpFiUVIyTBZCywbBIRW0w2eT0wlUWLEypfpi1EncCT8KVIOZW1RBw5ydFVQXW+G2d
c8UG2WVyeqHeoUkCZlwmKIVAoPDMXN2wBzBXntyzqcCSY5FwTwFBzl1UEsQc3KpemNYk9TG7FLSA
fYLY5PBbs8SuQgGFMBpPUWrXXtCpyZyWUphvw9WbFYYM9CtGRlvICA4ttmrsFv6ljx2MTKJDa9mI
LtDmNqgu47Bq5gYXwSm8qUEjaHZGD16JHGZ4fTQnN3Q5vRRG7mvrfFbuNg22hKSFsccSg41jDq2r
gC2NDBlDFmii3/K8MMMAgP5x1g/pN2yInWhEhlIIsdEfNOeD4YcNqt3yx3YioP1wT0wVKsZwmkZQ
i0qzUL6bVinJtDLniIrcENa2qsetN8OBX1UTi1FdVcmDOCoVSkAvCwMVv8XckU4UJB1QIHWA