diff options
| author | Bastien <bzg@gnu.org> | 2021-05-02 11:06:46 +0200 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2021-05-02 11:06:46 +0200 |
| commit | 379e22bfccaed43f4e9d8fa85e2613a697a0a04b (patch) | |
| tree | 439566eacb617e81510e05f2cffe8d4daa9f47e6 | |
| parent | c67413a7b67105e8659980afa8aa1c226719f33d (diff) | |
| parent | 0e7153e63d20032d35dde1626004c86ba3fcf2c1 (diff) | |
| download | org-mode-379e22bfccaed43f4e9d8fa85e2613a697a0a04b.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | testing/org-test.el | 4 |
1 files 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))) |