1 files changed, 8 insertions, 3 deletions

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 095ebe7245f..ab9a0ba8b7d 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -538,8 +538,10 @@ last ping."
                   (rcirc-send-string process
                                      (format "PRIVMSG %s :\C-aKEEPALIVE %f\C-a"
                                              rcirc-nick
-                                             (time-to-seconds
-                                              (current-time)))))))
+                                             (if (featurep 'xemacs)
+                                                 (time-to-seconds
+                                                  (current-time))
+                                               (float-time)))))))
             (rcirc-process-list))
     ;; no processes, clean up timer
     (cancel-timer rcirc-keepalive-timer)
@@ -547,7 +549,10 @@ last ping."
 
 (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)
   (with-rcirc-process-buffer process
-    (setq header-line-format (format "%f" (- (time-to-seconds (current-time))
+    (setq header-line-format (format "%f" (- (if (featurep 'xemacs)
+                                                 (time-to-seconds
+                                                  (current-time))
+                                               (float-time))
                                              (string-to-number message))))))
 
 (defvar rcirc-debug-buffer " *rcirc debug*")