Convert consecutive FSF copyright years to ranges.

[bpt/emacs.git] / lisp / eshell / esh-test.el

diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index e06719a..f5c55dd 100644 (file)
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -1,16 +1,15 @@
 ;;; esh-test.el --- Eshell test suite
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -45,22 +42,20 @@
 (defface eshell-test-ok
   '((((class color) (background light)) (:foreground "Green" :bold t))
     (((class color) (background dark)) (:foreground "Green" :bold t)))
-  "*The face used to highlight OK result strings."
+  "The face used to highlight OK result strings."
   :group 'eshell-test)
-;; backward-compatibility alias
-(put 'eshell-test-ok-face 'face-alias 'eshell-test-ok)
+(define-obsolete-face-alias 'eshell-test-ok-face 'eshell-test-ok "22.1")
 
 (defface eshell-test-failed
   '((((class color) (background light)) (:foreground "OrangeRed" :bold t))
     (((class color) (background dark)) (:foreground "OrangeRed" :bold t))
     (t (:bold t)))
-  "*The face used to highlight FAILED result strings."
+  "The face used to highlight FAILED result strings."
   :group 'eshell-test)
-;; backward-compatibility alias
-(put 'eshell-test-failed-face 'face-alias 'eshell-test-failed)
+(define-obsolete-face-alias 'eshell-test-failed-face 'eshell-test-failed "22.1")
 
 (defcustom eshell-show-usage-metrics nil
-  "*If non-nil, display different usage metrics for each Eshell command."
+  "If non-nil, display different usage metrics for each Eshell command."
   :set (lambda (symbol value)
         (if value
             (add-hook 'eshell-mode-hook 'eshell-show-usage-metrics)
@@ -73,8 +68,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (defvar test-buffer))
+(defvar test-buffer)
 
 (defun eshell-insert-command (text &optional func)
   "Insert a command at the end of the buffer."
@@ -106,7 +100,7 @@
       (eshell-redisplay))
     (let ((truth (eval command)))
       (with-current-buffer test-buffer
-       (delete-backward-char 6)
+       (delete-char -6)
        (insert-before-markers
         "[" (let (str)
               (if truth
@@ -155,7 +149,7 @@
 (defun eshell-test (&optional arg)
   "Test Eshell to verify that it works as expected."
   (interactive "P")
-  (let* ((begin (eshell-time-to-seconds (current-time)))
+  (let* ((begin (float-time))
         (test-buffer (get-buffer-create "*eshell test*")))
     (set-buffer (let ((inhibit-redisplay t))
                  (save-window-excursion (eshell t))))
@@ -181,8 +175,7 @@
     (with-current-buffer test-buffer
       (insert (format "\n\n--- %s --- (completed in %d seconds)\n"
                      (current-time-string)
-                     (- (eshell-time-to-seconds (current-time))
-                        begin)))
+                     (- (float-time) begin)))
       (message "Eshell test suite completed: %s failure%s"
               (if (> eshell-test-failures 0)
                   (number-to-string eshell-test-failures)
@@ -228,14 +221,13 @@
                  (if (eq eshell-show-usage-metrics t)
                      (- eshell-metric-after-command
                         eshell-metric-before-command 7)
-                   (- (eshell-time-to-seconds
+                   (- (float-time
                        eshell-metric-after-command)
-                      (eshell-time-to-seconds
+                      (float-time
                        eshell-metric-before-command))))
                 "\n"))))
            nil t))
 
 (provide 'esh-test)
 
-;; arch-tag: 6e32275a-8285-4a4e-b7cf-819aa7c86b8e
 ;;; esh-test.el ends here