* lisp/net/rcirc.el (rcirc-float-time): New function.

(rcirc-keepalive, rcirc-handler-ctcp-KEEPALIVE)
(rcirc-ctcp-sender-PING): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 399b1fff4e610feab153e2fc65a50c69c37c55e2..0ff975592ca58c560a4c5120c4bbd9ed2fc56717 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-17  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+       * net/rcirc.el (rcirc-float-time): New function.
+       (rcirc-keepalive, rcirc-handler-ctcp-KEEPALIVE)
+       (rcirc-ctcp-sender-PING): Use it.
+
 2011-02-17  Glenn Morris  <rgm@gnu.org>
 
        * speedbar.el (speedbar-ignored-modes, speedbar-file-unshown-regexp)

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 8657dc58bf4b2c2b873ea455be1e472c50188126..1d419dbfa182f24ca9187ae0ae47d15e3702253b 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -556,6 +556,11 @@ If ARG is non-nil, instead prompt for connection parameters."
   `(with-current-buffer rcirc-server-buffer
      ,@body))
 
+(defun rcirc-float-time ()
+  (if (featurep 'xemacs)
+      (time-to-seconds (current-time))
+    (float-time)))
+
 (defun rcirc-keepalive ()
   "Send keep alive pings to active rcirc processes.
 Kill processes that have not received a server message since the
@@ -567,10 +572,7 @@ last ping."
                   (rcirc-send-ctcp process
                                    rcirc-nick
                                    (format "KEEPALIVE %f"
-                                           (if (featurep 'xemacs)
-                                               (time-to-seconds
-                                                (current-time))
-                                             (float-time)))))))
+                                           (rcirc-float-time))))))
             (rcirc-process-list))
     ;; no processes, clean up timer
     (cancel-timer rcirc-keepalive-timer)
@@ -578,10 +580,7 @@ last ping."
 
 (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)
   (with-rcirc-process-buffer process
-    (setq header-line-format (format "%f" (- (if (featurep 'xemacs)
-                                                 (time-to-seconds
-                                                  (current-time))
-                                               (float-time))
+    (setq header-line-format (format "%f" (- (rcirc-float-time)
                                             (string-to-number message))))))
 
 (defvar rcirc-debug-buffer " *rcirc debug*")
@@ -2209,7 +2208,7 @@ With a prefix arg, prompt for new topic."
 
 (defun rcirc-ctcp-sender-PING (process target request)
   "Send a CTCP PING message to TARGET."
-  (let ((timestamp (format "%.0f" (float-time))))
+  (let ((timestamp (format "%.0f" (rcirc-float-time))))
     (rcirc-send-ctcp process target "PING" timestamp)))
 
 (defun rcirc-cmd-me (args &optional process target)