summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2015-01-25 11:20:02 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2015-01-25 11:20:31 +0100
commit6b24ffdad90d3c48005f99c896e7beeb2ac4d5f1 (patch)
tree71e868eb0b192bf48df481d4bdce44b72da82b52
parent61eedb852fe1ca80f28d2bdd0c069a5fa702b6b9 (diff)
downloadorg-mode-6b24ffdad90d3c48005f99c896e7beeb2ac4d5f1.tar.gz
compatibility fixes for fda70440f4
* testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Replace `cl-letf' with `letf' for compatibility with older Emacsen. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Also check for 'error since 'user-error is not used by older Emacsen.
-rw-r--r--testing/lisp/test-ob-lob.el2
-rw-r--r--testing/lisp/test-org-timer.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/testing/lisp/test-ob-lob.el b/testing/lisp/test-ob-lob.el
index 89650aa..31862af 100644
--- a/testing/lisp/test-ob-lob.el
+++ b/testing/lisp/test-ob-lob.el
@@ -39,7 +39,7 @@
(ert-deftest test-ob-lob/call-with-header-arguments ()
"Test the evaluation of a library of babel #+call: line."
- (cl-letf (((symbol-function 'org-babel-insert-result)
+ (letf (((symbol-function 'org-babel-insert-result)
(symbol-function 'ignore)))
(org-test-at-id "fab7e291-fde6-45fc-bf6e-a485b8bca2f0"
(move-beginning-of-line 1)
diff --git a/testing/lisp/test-org-timer.el b/testing/lisp/test-org-timer.el
index cfa9071..db59a89 100644
--- a/testing/lisp/test-org-timer.el
+++ b/testing/lisp/test-org-timer.el
@@ -263,13 +263,13 @@ Also, mute output from `message'."
(test-org-timer/with-temp-text ""
(org-timer-start)
(org-timer-set-timer 10))
- :type 'user-error)
+ :type (list 'error 'user-error))
;; Countdown timer is running.
(should-error
(test-org-timer/with-temp-text ""
(org-timer-set-timer 10)
(org-timer-start))
- :type 'user-error))
+ :type (list 'error 'user-error)))
(provide 'test-org-timer)
;;; test-org-timer.el end here