[elpa] externals/org 379e22b: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 379e22bfccaed43f4e9d8fa85e2613a697a0a04b
Merge: c67413a 0e7153e
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'maint'
---
 testing/org-test.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/org-test.el b/testing/org-test.el
index ade2124..30adb97 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -466,8 +466,8 @@ TIME can be a non-nil Lisp time value, or a string 
specifying a date and time."
               (apply ,(symbol-function 'current-time-zone)
                      (or time ,at) args)))
            ((symbol-function 'decode-time)
-            (lambda (&optional time) (funcall ,(symbol-function 'decode-time)
-                                              (or time ,at))))
+            (lambda (&optional time zone form) (funcall ,(symbol-function 
'decode-time)
+                                                   (or time ,at) zone form)))
            ((symbol-function 'encode-time)
             (lambda (time &rest args)
               (apply ,(symbol-function 'encode-time) (or time ,at) args)))