From 921c47764677d19d42cb647fd0c32e9c7440b5dc Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 16 Sep 2016 06:15:00 +0000 Subject: [PATCH] * 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 --- ChangeLog | 10 ++++++++-- 1 file 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 + + * 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 * 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))