From: Christian Ohler <ohler@gnu.org>
Date: Thu, 3 Mar 2011 09:10:19 +0000 (-0700)
Subject: Merged an ERT fix and a speedup.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~57
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28dd38e4d4977f7fdb7a752a339c1a7ca178523f;p=emacs.git

Merged an ERT fix and a speedup.
---

28dd38e4d4977f7fdb7a752a339c1a7ca178523f
diff --cc lisp/ChangeLog
index c97cf6e781b,9602bf20af6..ab96ec4ad01
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,12 -1,19 +1,28 @@@
+ 2011-03-03  Christian Ohler  <ohler@gnu.org>
+ 
+ 	* emacs-lisp/ert.el (ert--explain-equal): New function.
+ 	(ert--explain-equal-rec): Renamed from `ert--explain-not-equal'.
+ 	All callers changed.
+ 	(ert--explain-equal-including-properties): Renamed from
+ 	`ert--explain-not-equal-including-properties'.  All callers
+ 	changed.
+ 
+ 2011-03-03  Christian Ohler  <ohler@gnu.org>
+ 
+ 	* emacs-lisp/ert.el (ert--stats-set-test-and-result)
+ 	(ert-char-for-test-result, ert-string-for-test-result)
+ 	(ert-run-tests-batch, ert--print-test-for-ewoc):
+ 	Handle `ert-test-quit'.
+ 
 +2011-03-03  David Abrahams  <dave@boostpro.com>  (tiny change)
 +
 +	* vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
 +	Move ediff-defvar-local calls after defcustoms.  (Bug#1821)
 +
 +2011-03-03  Glenn Morris  <rgm@gnu.org>
 +
 +	* files.el (file-truename): Doc fix.  (Bug#2341)
 +
  2011-03-03  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
  
  	* vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e. (Bug#7349)