aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2014-05-11 09:39:49 +0800
committerLeo Liu2014-05-11 09:39:49 +0800
commit2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53 (patch)
treeec1b7142a27926b1f52632167266aa77954df8e5
parentf36f0bca381402745550aed8ccfd8e447efb1dd8 (diff)
downloademacs-2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53.tar.gz
emacs-2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53.zip
* net/rcirc.el (rcirc-sentinel): Fix last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a9b1991279..b7a0f49bded 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-05-11 Leo Liu <sdl.web@gmail.com>
2
3 * net/rcirc.el (rcirc-sentinel): Fix last change.
4
12014-05-08 Sam Steingold <sds@gnu.org> 52014-05-08 Sam Steingold <sds@gnu.org>
2 6
3 * net/rcirc.el (rcirc-reconnect-delay): New user option. 7 * net/rcirc.el (rcirc-reconnect-delay): New user option.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 346c885fda4..963b5aa12b6 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -686,7 +686,7 @@ When 0, do not auto-reconnect."
686 (when (or (null rcirc-last-connect-time) 686 (when (or (null rcirc-last-connect-time)
687 (< rcirc-reconnect-delay 687 (< rcirc-reconnect-delay
688 (float-time (time-subtract now rcirc-last-connect-time)))) 688 (float-time (time-subtract now rcirc-last-connect-time))))
689 (setq sds-rcirc-sentinel-last now) 689 (setq rcirc-last-connect-time now)
690 (rcirc-cmd-reconnect nil)))) 690 (rcirc-cmd-reconnect nil))))
691 (run-hook-with-args 'rcirc-sentinel-functions process sentinel)))) 691 (run-hook-with-args 'rcirc-sentinel-functions process sentinel))))
692 692