Merge branch 'maint'

2017-08-10 22:40:34 +02:00 · 2017-08-10 22:40:34 +02:00 · 9945e029f5
parent 323fc95b4f bff63cbeb3
commit 9945e029f5
1 changed files with 3 additions and 1 deletions
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@ -375,7 +375,9 @@
  "Test `org-deadline-close-p' specifications."
  ;; Pretend that the current time is 2016-06-03 Fri 01:43
  (cl-letf (((symbol-function 'current-time)
-	     (lambda () '(22353 6425 905205 644000))))
+	     (lambda ()
+	       (apply #'encode-time
+		      (org-parse-time-string "2016-06-03 Fri 01:43")))))
    ;; Timestamps are close if they are within `ndays' of lead time.
    (org-test-with-temp-text "* Heading"
      (should (org-deadline-close-p "2016-06-03 Fri" 0))