Merge from emacs-23

[gnu-emacs] / test / cedet / cedet-utests.el

diff --git a/test/cedet/cedet-utests.el b/test/cedet/cedet-utests.el
index 59d080685ed49df12f69782a07ab44aeb4b28226..288ef6a132f0b21c189f7f20268d289eb5a94ab3 100644 (file)
--- a/test/cedet/cedet-utests.el
+++ b/test/cedet/cedet-utests.el
@@ -1,6 +1,6 @@
 ;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
 
-;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -236,7 +236,7 @@ Argument START and END bound the time being calculated."
 (defun cedet-utest-log-shutdown (title &optional errorcondition)
   "Shut-down a larger test suite.
 TITLE is the section that is done.
-ERRORCONDITION is some error that may have occured durinig testing."
+ERRORCONDITION is some error that may have occurred during testing."
   (let ((endtime (current-time))
        )
     (cedet-utest-log-shutdown-msg title cedet-utest-log-timer endtime)
@@ -466,7 +466,7 @@ converted into.")
 
 (defun pulse-test (&optional no-error)
   "Test the lightening function for pulsing a line.
-When optional NO-ERROR Don't throw an error if we can't run tests."
+When optional NO-ERROR don't throw an error if we can't run tests."
   (interactive)
   (if (or (not pulse-flag) (not (pulse-available-p)))
       (if no-error