auto upstream

2 files changed, 5 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index b7b628cce69..c409e891d97 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-09  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+
+        * automated/undo-tests.el (undo-test0): Adjust error to code change.
+
 2013-01-08  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
 
         * automated/undo-tests.el: New file.
diff --git a/test/automated/undo-tests.el b/test/automated/undo-tests.el
index 3e71d974e5b..3037db03602 100644
--- a/test/automated/undo-tests.el
+++ b/test/automated/undo-tests.el
@@ -79,7 +79,7 @@
     (undo)
     (should
      (equal (should-error (undo-more nil))
-            '(wrong-type-argument integerp nil)))
+            '(wrong-type-argument number-or-marker-p nil)))
     (undo-more 7)
     (should (string-equal "" (buffer-string)))))