[Emacs-diffs] /srv/bzr/emacs/trunk r111819: * net/rcirc.el (rcirc-keepalive): Fix invalid timer error.

[Leo Liu]

------------------------------------------------------------
revno: 111819
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-18 00:26:38 +0800
message:
  * net/rcirc.el (rcirc-keepalive): Fix invalid timer error.
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-17 03:40:38 +0000
+++ b/lisp/ChangeLog    2013-02-17 16:26:38 +0000
@@ -1,3 +1,7 @@
+2013-02-17  Leo Liu  <address@hidden>
+
+       * net/rcirc.el (rcirc-keepalive): Fix invalid timer error.
+
 2013-02-17  Glenn Morris  <address@hidden>
 
        * menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry.

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2013-01-02 16:13:04 +0000
+++ b/lisp/net/rcirc.el 2013-02-17 16:26:38 +0000
@@ -625,7 +625,8 @@
                                            (rcirc-float-time))))))
             (rcirc-process-list))
     ;; no processes, clean up timer
-    (cancel-timer rcirc-keepalive-timer)
+    (when (timerp rcirc-keepalive-timer)
+      (cancel-timer rcirc-keepalive-timer))
     (setq rcirc-keepalive-timer nil)))
 
 (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)