3 files changed, 27 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6c5b1342d32..3a71c1c8d78 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * coccinelle/list_loop.cocci: Semantic patch to convert from Fcdr
+        to XCDR and consistently use CONSP in the list iteration loops.
+        * coccinelle/vector_contents.cocci: Fix indentation.
+
 2012-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * bzrmerge.el: Use cl-lib.
diff --git a/admin/coccinelle/list_loop.cocci b/admin/coccinelle/list_loop.cocci
new file mode 100644
index 00000000000..89f0bfff7b3
--- /dev/null
+++ b/admin/coccinelle/list_loop.cocci
@@ -0,0 +1,19 @@
+// Omit redundant type check, consistently use CONSP.
+@@
+identifier A;
+expression X;
+statement S;
+@@
+(
+for (A = X; 
+- !NILP (A); 
++ CONSP (A);
+- A = Fcdr (A))
++ A = XCDR (A))
+S
+|
+for (A = X; CONSP (A);
+- A = Fcdr (A))
++ A = XCDR (A))
+S
+)
diff --git a/admin/coccinelle/vector_contents.cocci b/admin/coccinelle/vector_contents.cocci
index beebc2d2089..3c696ffd237 100644
--- a/admin/coccinelle/vector_contents.cocci
+++ b/admin/coccinelle/vector_contents.cocci
@@ -11,6 +11,6 @@ expression E1, E2;
 - XVECTOR (I1)->contents[E1] = E2
 + ASET (I1, E1, E2)
 |
--XVECTOR (I1)->contents[E1]
-+AREF (I1, E1)
+- XVECTOR (I1)->contents[E1]
++ AREF (I1, E1)
 )