merge trunk

2 files changed, 8 insertions, 4 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index cf709f01eec..12238560dc9 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/octave.m: Remove some `fixindent' not needed any more.
+
 2010-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * indent/octave.m: New file.
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 830af96ed8e..61db73b91e8 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -1415,7 +1415,7 @@ function create_pkgadddel (desc, packdir, nm, global_install)
     endfor                                   # fixindent
 
     ## Search all C++ source files for PKG commands.
-    lst = dir (fullfile (packdir, "src", "*.cc")); # fixindent
+    lst = dir (fullfile (packdir, "src", "*.cc"));
     for i = 1:length (lst)
       nam = fullfile (packdir, "src", lst(i).name);
       fwrite (archfid, extract_pkg (nam, ['^//* *' nm ': *(.*)$']));
@@ -1451,10 +1451,10 @@ function create_pkgadddel (desc, packdir, nm, global_install)
         unlink (archpkg);
       endif
     endif
-  endif                         # fixindent
-endfunction                     # fixindent
+  endif
+endfunction
 
-function copy_files (desc, packdir, global_install) # fixindent
+function copy_files (desc, packdir, global_install)
   ## Create the installation directory.
   if (! exist (desc.dir, "dir"))
     [status, output] = mkdir (desc.dir);