Merge branch 'master' into xwidget

3 files changed, 15 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index dcce0bf3c39..d63a561953d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,7 +1,12 @@
+2015-01-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/cl-generic-tests.el (setf cl--generic-2): Make sure
+        the setf can be used already in the body of the method.
+
 2015-01-20  Jorgen Schaefer  <contact@jorgenschaefer.de>
 
         * automated/package-test.el (package-test-install-prioritized):
-        Removed test due to unreproducable failures.
+        Remove test due to unreproducable failures.
 
 2015-01-20  Michal Nazarewicz  <mina86@mina86.com>
 
@@ -15,8 +20,8 @@
         A new helper function for testing `tildify-double-space-undos'
         behaviour in the `tildify-space' function.
         (tildify-space-undo-test-html, tildify-space-undo-test-html-nbsp)
-        (tildify-space-undo-test-xml, tildify-space-undo-test-tex): New
-        tests for `tildify-doule-space-undos' behaviour.
+        (tildify-space-undo-test-xml, tildify-space-undo-test-tex):
+        New tests for `tildify-doule-space-undos' behaviour.
 
         * automated/tildify-tests.el (tildify-space-test--test):
         A new helper function for testing `tildify-space' function.
diff --git a/test/automated/cl-generic-tests.el b/test/automated/cl-generic-tests.el
index 1c01d9b164b..bc9a1ece423 100644
--- a/test/automated/cl-generic-tests.el
+++ b/test/automated/cl-generic-tests.el
@@ -73,6 +73,11 @@
   (should (equal (cl--generic-1 (make-cl-generic-struct-child11) nil)
                  '("child11" "around""child1" "parent" a))))
 
+;; I don't know how to put this inside an `ert-test'.  This tests that `setf'
+;; can be used directly inside the body of the setf method.
+(cl-defmethod (setf cl--generic-2) (v (y integer) z)
+  (setf (cl--generic-2 (nth y z) z) v))
+
 (ert-deftest cl-generic-test-03-setf ()
   (cl-defmethod (setf cl--generic-1) (v (y t) z) (list v y z))
   (cl-defmethod (setf cl--generic-1) (v (_y (eql 4)) z) (list v "four" z))
diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el
index 3918fb904fe..da5f59a4654 100644
--- a/test/automated/eieio-test-methodinvoke.el
+++ b/test/automated/eieio-test-methodinvoke.el
@@ -292,6 +292,7 @@
 
 (defmethod initialize-instance :after ((this eitest-Ja) &rest slots)
   ;(message "+Ja")
+  ;; FIXME: Using next-method-p in an after-method is invalid!
   (when (next-method-p)
     (call-next-method))
   ;(message "-Ja")
@@ -302,6 +303,7 @@
 
 (defmethod initialize-instance :after ((this eitest-Jb) &rest slots)
   ;(message "+Jb")
+  ;; FIXME: Using next-method-p in an after-method is invalid!
   (when (next-method-p)
     (call-next-method))
   ;(message "-Jb")