summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-16 06:15:00 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-16 06:15:00 +0000
commit921c47764677d19d42cb647fd0c32e9c7440b5dc (patch)
tree6765edd490d5bbcc9dd47156d4a34d18c525ad48
parentf98a2c8f87da34ed5e8d5a6c95ac713b9f511172 (diff)
* ChangeLog (add-log-time-format): Not exactly sure when but
recently (25.x maybe), emacs changed its API to take optional two arguments. We have to follow that. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
1 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d3b2eee49b..2e8780b546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 16 14:35:55 2016 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * ChangeLog (add-log-time-format): Not exactly sure when but
+ recently (25.x maybe), emacs changed its API to take optional
+ two arguments. We have to follow that.
+
Fri Sep 16 06:43:25 2016 Aaron Patterson <tenderlove@ruby-lang.org>
* lib/uri/generic.rb (def check_password): don't include bad password
@@ -8166,8 +8172,8 @@ For the changes before 1.8.0, see doc/ChangeLog-1.8.0
Local variables:
coding: us-ascii
-add-log-time-format: (lambda ()
- (let* ((time (current-time))
+add-log-time-format: (lambda (&optional x y)
+ (let* ((time (or x (current-time)))
(system-time-locale "C")
(diff (+ (cadr time) 32400))
(lo (% diff 65536))