Merge from trunk

3 files changed, 13 insertions, 4 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 12238560dc9..feae114f862 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/prolog.prolog: Use normal spacing around !.
+
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/octave.m: Remove one more `fixindent'.  Use `end'.
+
 2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * indent/octave.m: Remove some `fixindent' not needed any more.
@@ -18,7 +26,8 @@
         (icalendar-testsuite--do-test-export): Code formatting.
         (icalendar-testsuite--test-parse-vtimezone): Doc fix.
         (icalendar-testsuite--do-test-import)
-        (icalendar-testsuite--do-test-cycle): Use icalendar-testsuite--compare-strings
+        (icalendar-testsuite--do-test-cycle):
+        Use icalendar-testsuite--compare-strings
         (icalendar-testsuite--run-import-tests): Comment added.
         (icalendar-testsuite--run-import-tests)
         (icalendar-testsuite--run-real-world-tests): Fix expected results.
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 61db73b91e8..dc6f8448152 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -6,7 +6,7 @@ function res = tcomp (fn)
          
   if nargin ~= 1
     print_usage()
-  endif
+  end
 
   data = dlmread(fn, 3, 0);
 
@@ -1412,7 +1412,7 @@ function create_pkgadddel (desc, packdir, nm, global_install)
     for i = 1:length (lst)
       nam = fullfile (packdir, "inst", lst(i).name);
       fwrite (instfid, extract_pkg (nam, ['^[#%][#%]* *' nm ': *(.*)$']));
-    endfor                                   # fixindent
+    endfor
 
     ## Search all C++ source files for PKG commands.
     lst = dir (fullfile (packdir, "src", "*.cc"));
diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog
index 968cef57114..8b96cd56a33 100644
--- a/test/indent/prolog.prolog
+++ b/test/indent/prolog.prolog
@@ -150,7 +150,7 @@ generalize(Ee, Te, Env, Eg, Tg) :-
 %% instantiate(+X, +T, -E)
 %% Utilise la variable X de type T.  Le résultat E est X auquel on ajoute
 %% tous les arguments implicites (de valeur inconnue).
-instantiate(X, T, X) :- var(T), ! .
+instantiate(X, T, X) :- var(T), !.
 instantiate(X, forall(_, _, T), app(E, _)) :- !, instantiate(X, T, E).
 instantiate(X, _, X).