Merge Org up to commit 4cac75153. Some ChangeLog formatting fixes.

[gnu-emacs] / test / eshell.el

diff --git a/test/eshell.el b/test/eshell.el
index 3b392e84c24885d5f970330b90b93f2514a9be5f..7baeb58a56a98f78bb95fa8f6f17db4445ce744d 100644 (file)
--- a/test/eshell.el
+++ b/test/eshell.el
@@ -1,6 +1,6 @@
 ;;; esh-test.el --- Eshell test suite
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -28,7 +28,7 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)                                ; assert
+  (require 'cl-lib)
   (require 'eshell)
   (require 'esh-util))
 (require 'esh-mode)
@@ -267,9 +267,9 @@
 
 (eshell-deftest banner banner-displayed
   "Startup banner is displayed at point-min"
-  (assert eshell-banner-message)
+  (cl-assert eshell-banner-message)
   (let ((msg (eval eshell-banner-message)))
-    (assert msg)
+    (cl-assert msg)
     (goto-char (point-min))
     (looking-at msg)))
 
@@ -396,7 +396,7 @@
   (eshell-command-result-p "+ ${+ 1 2} 3" "6\n"))
 
 (eshell-deftest var interp-lisp
-  "Interpolate Lisp form evalution"
+  "Interpolate Lisp form evaluation"
   (eshell-command-result-p "+ $(+ 1 2) 3" "6\n"))
 
 (eshell-deftest var interp-concat