Merge from origin/emacs-24

[gnu-emacs] / test / automated / eieio-test-persist.el

diff --git a/test/automated/eieio-test-persist.el b/test/automated/eieio-test-persist.el
index 5ea7cf25740815d907195fc91c360c6d037ce4f3..7bb2f1ca77962c83ebc5904a9f7347bac68a1a4f 100644 (file)
--- a/test/automated/eieio-test-persist.el
+++ b/test/automated/eieio-test-persist.el
@@ -1,6 +1,6 @@
 ;;; eieio-persist.el --- Tests for eieio-persistent class
 
-;; Copyright (C) 2011-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -203,7 +203,7 @@ persistent class.")
 ;; A slot that contains another object that isn't persistent
 (defclass persistent-with-objs-list-slot (eieio-persistent)
   ((pnp :initarg :pnp
-       :type persist-not-persistent-list
+       :type (list-of persist-not-persistent)
        :initform nil))
   "Class for testing the saving of slots with objects in them.")