HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes made in Gnus master
[bpt/emacs.git]
/
lisp
/
net
/
rcirc.el
diff --git
a/lisp/net/rcirc.el
b/lisp/net/rcirc.el
index
086043c
..
7c70ded
100644
(file)
--- a/
lisp/net/rcirc.el
+++ b/
lisp/net/rcirc.el
@@
-625,7
+625,8
@@
last ping."
(rcirc-float-time))))))
(rcirc-process-list))
;; no processes, clean up timer
(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)
(setq rcirc-keepalive-timer nil)))
(defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)