Index: ats2-lang-0.4.2/utils/emacs/ats2-mode.el
===================================================================
--- ats2-lang-0.4.2.orig/utils/emacs/ats2-mode.el
+++ ats2-lang-0.4.2/utils/emacs/ats2-mode.el
@@ -32,7 +32,6 @@
 
 ;;; Code:
 
-(require 'cl)
 (require 'compile)
 
 (when (not (boundp 'xemacsp))
@@ -407,7 +406,7 @@
   (set (make-local-variable 'comment-continue)  " *")
   (set (make-local-variable 'comment-end) "*)")
   (setq indent-line-function 'tab-to-tab-stop)
-  (setq tab-stop-list (loop for x from 2 upto 120 by 2 collect x))
+  (setq tab-stop-list (cl-loop for x from 2 upto 120 by 2 collect x))
   (setq indent-tabs-mode nil)
   (local-set-key (kbd "RET") 'newline-and-indent-relative)
   (unless (local-variable-p 'compile-command)
@@ -420,20 +419,20 @@
    ;; Emacs 21
    ((and (< emacs-major-version 22)
          (not xemacsp)) 
-    (pushnew '("\\(syntax error: \\)?\\([^\n:]*\\): \\[?[0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\]?" 2 3 4)
+    (cl-pushnew '("\\(syntax error: \\)?\\([^\n:]*\\): \\[?[0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\]?" 2 3 4)
              compilation-error-regexp-alist))
    ;; Emacs 22+ has an improved compilation mode
    ((and (>= emacs-major-version 22)
          (not xemacsp))
-    (pushnew '(ats "\\(syntax error: \\)?\\([^\n:]*\\): \\[?[0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\]?\\(?: -- [0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\)?" 2 (3 . 5) (4 . 6))
+    (cl-pushnew '(ats "\\(syntax error: \\)?\\([^\n:]*\\): \\[?[0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\]?\\(?: -- [0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\)?" 2 (3 . 5) (4 . 6))
              compilation-error-regexp-alist-alist)
-    (pushnew 'ats compilation-error-regexp-alist))
+    (cl-pushnew 'ats compilation-error-regexp-alist))
    ;; XEmacs has something different, to be contrary
    (xemacsp
-    (pushnew '(ats ("\\(syntax error: \\)?\\([^\n:]*\\): \\[?[0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\]?" 2 3 4))
+    (cl-pushnew '(ats ("\\(syntax error: \\)?\\([^\n:]*\\): \\[?[0-9]*(line=\\([0-9]*\\), offs=\\([0-9]*\\))\\]?" 2 3 4))
              compilation-error-regexp-alist-alist)
     (unless (eql 'all compilation-error-regexp-systems-list)
-      (pushnew 'ats compilation-error-regexp-systems-list))
+      (cl-pushnew 'ats compilation-error-regexp-systems-list))
     (compilation-build-compilation-error-regexp-alist)
     (message "WARNING! XEMACS IS DEAD AND DEPRECATED."))))