diff options
| author | Leo Liu | 2014-05-11 09:39:49 +0800 |
|---|---|---|
| committer | Leo Liu | 2014-05-11 09:39:49 +0800 |
| commit | 2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53 (patch) | |
| tree | ec1b7142a27926b1f52632167266aa77954df8e5 | |
| parent | f36f0bca381402745550aed8ccfd8e447efb1dd8 (diff) | |
| download | emacs-2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53.tar.gz emacs-2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53.zip | |
* net/rcirc.el (rcirc-sentinel): Fix last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 2 |
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 @@ | |||
| 1 | 2014-05-11 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * net/rcirc.el (rcirc-sentinel): Fix last change. | ||
| 4 | |||
| 1 | 2014-05-08 Sam Steingold <sds@gnu.org> | 5 | 2014-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 | ||