[nongnu] elpa/gnuplot ed930f3 116/184: Fix compile errors when testing from command line

[ELPA Syncer]

branch: elpa/gnuplot
commit ed930f3d0e51f3bf4e45f499b4542bbeeddb1044
Author: joddie <jonxfield@gmail.com>
Commit: joddie <jonxfield@gmail.com>

    Fix compile errors when testing from command line
---
 gnuplot-context.el      |  2 +-
 gnuplot-test-context.el | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 18d8dcc..dfac86b 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -582,7 +582,7 @@ name; otherwise continues tokenizing up to the token at 
point. FIXME"
 ;;
 
 
-(eval-when-compile
+(eval-and-compile
   ;; Compile a single pattern into a list of instructions. Leaves
   ;; calls to other rules as symbolic instructions (call SYMBOL) and
   ;; jumps, commits etc. as relative offsets; these are resolved into
diff --git a/gnuplot-test-context.el b/gnuplot-test-context.el
index 78c0cdf..dfc7046 100644
--- a/gnuplot-test-context.el
+++ b/gnuplot-test-context.el
@@ -2,14 +2,12 @@
 ;; automated tests for gnuplot-mode context matching
 ;;
 
-;; Because of eval-when-compile clauses, these tests only run when the
-;; interpreted version of "gnuplot-context" is loaded.  TODO: Fix
-;; this. :-/
-(require 'gnuplot-context "gnuplot-context.el")
+(require 'gnuplot-context)
 
 (require 'ert)
 
 (eval-when-compile
+  (require 'cl)
   (if (not (fboundp 'ert-deftest))
       (defalias 'ert-deftest 'deftest))
 
@@ -30,14 +28,6 @@
     (goto-char (point-max))
     (gnuplot-tokenize)))
 
-(defmacro with-gnuplot-tokens-from-string (binding &rest body)
-  (declare (indent 1))
-  `(with-temp-buffer
-     (gnuplot-mode)
-     (insert ,(cadr binding))
-     (let ((,(car binding) (gnuplot-tokenize)))
-       ,@body)))
-
 (defun gnuplot-simplify-tokens (tokens)
   (mapcar
    (lambda (token)