From ee01a70adb0144a87718a53c9e3af3e9a83bb06b Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 25 Jan 2015 11:15:10 +0100 Subject: [PATCH] rework fix in82599d37e1 to use should-error macro * testing/lisp/test-org-table.el: Use `should-error' instead of `condition-case' as that is what ERT provides for these sort of tests. --- testing/lisp/test-org-table.el | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/testing/lisp/test-org-table.el b/testing/lisp/test-org-table.el index 6d09c4034..e619cbc3d 100644 --- a/testing/lisp/test-org-table.el +++ b/testing/lisp/test-org-table.el @@ -1674,25 +1674,21 @@ is t, then new columns should be added as needed" (let ((org-table-formula-create-columns nil)) - ;; need condition-case to trap the out-of-bounds user-error - (condition-case - nil - (org-test-table-target-expect - " + (should-error + (org-test-table-target-expect + " | 2 | | 4 | | 8 | " - " + " | 2 | | 4 | | 8 | " - 1 - "#+TBLFM: @1$2=5") - ('user-error t) - ;; Older Emacsen will throw an 'error instead of 'user-error. - ('error t))) + 1 + "#+TBLFM: @1$2=5") + :type (list 'error 'user-error))) (let ((org-table-formula-create-columns t)) -- 2.11.4.GIT