From 14c51bae5f196269612c816334cf5cd63b091aae Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 25 Jul 2016 16:11:51 +0200
Subject: [PATCH] org-test: Require cl-lib in interactive tests

* testing/org-test.el: Require `cl-lib'.  Remove support for Emacs 22.
(org-test-string-exact-match): Fix docstring.
---
 testing/org-test.el | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/testing/org-test.el b/testing/org-test.el
index a07ccc737..ed831fa26 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -54,35 +54,13 @@
       (org-babel-do-load-languages
        'org-babel-load-languages '((shell . t) (org . t))))
 
-    (let* ((load-path (cons
-		       org-test-dir
-		       (cons
-			(expand-file-name "jump" org-test-dir)
-			load-path))))
-      (require 'cl)
-      (when (= emacs-major-version 22)
-	(defvar special-mode-map
-	  (let ((map (make-sparse-keymap)))
-	    (suppress-keymap map)
-	    (define-key map "q" 'quit-window)
-	    (define-key map " " 'scroll-up)
-	    (define-key map "\C-?" 'scroll-down)
-	    (define-key map "?" 'describe-mode)
-	    (define-key map "h" 'describe-mode)
-	    (define-key map ">" 'end-of-buffer)
-	    (define-key map "<" 'beginning-of-buffer)
-	    (define-key map "g" 'revert-buffer)
-	    (define-key map "z" 'kill-this-buffer)
-	    map))
-
-	(put 'special-mode 'mode-class 'special)
-	(define-derived-mode special-mode nil "Special"
-	  "Parent major mode from which special major modes should inherit."
-	  (setq buffer-read-only t)))
+    (let ((load-path (cons org-test-dir
+			   (cons (expand-file-name "jump" org-test-dir)
+				 load-path))))
+      (require 'cl-lib)
       (require 'ert)
       (require 'ert-x)
-      (when (file-exists-p
-	     (expand-file-name "jump/jump.el" org-test-dir))
+      (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir))
 	(require 'jump)
 	(require 'which-func)))))
 
@@ -344,7 +322,7 @@ setting `pp-escape-newlines' to nil manually."
 
 
 (defun org-test-string-exact-match (regex string &optional start)
-  "case sensative string-match"
+  "Case sensitive string-match"
   (let ((case-fold-search nil)
         (case-replace nil))
     (if(and (equal regex "")