* src/eval.c (run_hook_with_args): Use FUNCTIONP.

* test/indent/css-mode.css (.x2): Test alignement inside braces.
* test/indent/prolog.prolog: Test alignment of ->; with operator at bol.

4 files changed, 26 insertions, 6 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 9db787cc3ac..eadff76e7b6 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,9 +1,15 @@
+2013-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/prolog.prolog: Test alignment of ->; with operator at bol.
+
+        * indent/css-mode.css (.x2): Test alignement inside braces.
+
 2013-10-26  Dmitry Gutov  <dgutov@yandex.ru>
 
         * indent/ruby.rb: New failing example.
 
-        * automated/ruby-mode-tests.el (ruby-toggle-block-to-brace): Fix
-        the test, in respect to adding the space after the curly.
+        * automated/ruby-mode-tests.el (ruby-toggle-block-to-brace):
+        Fix the test, in respect to adding the space after the curly.
 
 2013-10-24  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -45,8 +51,8 @@
 
 2013-10-21  Dmitry Gutov  <dgutov@yandex.ru>
 
-        * indent/ruby.rb: New examples for indentation of blocks.  Example
-        of hash inside parens that inflooped before the present commit.
+        * indent/ruby.rb: New examples for indentation of blocks.
+        Example of hash inside parens that inflooped before the present commit.
 
 2013-10-17  Barry O'Reilly  <gundaetiapo@gmail.com>
 
diff --git a/test/indent/css-mode.css b/test/indent/css-mode.css
index 9a2a15f6ba5..4dbab06975c 100644
--- a/test/indent/css-mode.css
+++ b/test/indent/css-mode.css
@@ -4,6 +4,8 @@
 
 .x2
 {
+    foo: bar;
+    bar: baz;
 }
 
 div.x3
diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog
index 8af21877b59..5b5d272c579 100644
--- a/test/indent/prolog.prolog
+++ b/test/indent/prolog.prolog
@@ -48,7 +48,19 @@ subst(X, V, FV, lambda(Y, Ti, Bi), lambda(Y1, To, Bo)) :-
           subst(Y, Y1, [], Bi, Bi1);
       Y1 = Y, Bi1 = Bi),
      %% Perform substitution on the body.
-     subst(X, V, FV, Bi1, Bo)).
+     subst(X, V, FV, Bi1, Bo)),
+    (   X = Y
+     %% If X is equal to Y, X is shadowed, so no subst can take place.
+     -> Y1 = Y, Bo = Bi
+     ;  (member((Y, _), FV)
+         %% If Y appears in FV, it can appear in V, so we need to
+         %% rename it to avoid name capture.
+         -> new_atom(Y, Y1),
+            subst(Y, Y1, [], Bi, Bi1)
+         ; Y1 = Y, Bi1 = Bi),
+        %% Perform substitution on the body.
+        subst(X, V, FV, Bi1, Bo)
+    ).
 subst(X, V, FV, pi(Y, Ti, Bi), pi(Y1, To, Bo)) :-
     subst(X, V, FV, lambda(Y, Ti, Bi), lambda(Y1, To, Bo)).
 subst(X, V, FV, forall(Y, Ti, Bi), forall(Y1, To, Bo)) :-
diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index e402398b996..fdf736e06be 100755
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -35,7 +35,7 @@ echo $[1<<8]                    # bug#11263
 declare -a VERSION
 for i in $(ls "$PREFIX/sbin") ; do
     echo -e $N')' $i
-    VERSION[${#VERSION[*]}]=$i         #bug#11946.
+    VERSION[${#VERSION[*]}]=$i  # bug#11946.
     N=$(($N + 1))
 done