Simplify use of current-time and friends.

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index fd8f83bd78b61d0a0fc1a569bd866a910b211dfc..75a01581fcd41c4f8e36fcf93f1633a4fafd9689 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,24 @@
+2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Simplify use of current-time and friends.
+       * erc-backend.el (TOPIC): Omit unnecessary call to current-time.
+       * erc.el (erc-emacs-time-to-erc-time): Simplify by using float-time.
+       (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
+
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to 24.4 release.
+
+2014-10-15  Ivan Shmakov  <ivan@siamics.net>
+
+       * erc-track.el (erc-modified-channels-display): Update mode line
+       more frequently (bug#18510).
+
+2014-10-10  Kelvin White  <kwhite@gnu.org>
+
+       * erc.el (erc-initialize-log-marker): Only initialize
+         erc-last-saved-position if not already a marker.
+
 2014-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc.el (erc-channel-receive-names): Silence compiler warning.
@@ -429,9 +450,9 @@
 
 2011-11-28  Mike Kazantsev  <mk.fraggod@gmail.com>  (tiny change)
 
-       * erc-dcc.el (erc-dcc-ctcp-query-send-regexp): Updated regexp to
+       * erc-dcc.el (erc-dcc-ctcp-query-send-regexp): Update regexp to
        match quoted filenames with spaces inside.
-       (erc-dcc-handle-ctcp-send): Updated regexp match group numbers,
+       (erc-dcc-handle-ctcp-send): Update regexp match group numbers,
        added processing of escaped quotes and backslashes if filename
        itself was in quotes.