Merge remote-tracking branch 'origin/trunk' into xwidget

2 files changed, 5 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 8ab70c98c82..56e019ec4af 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Leo Liu  <sdl.web@gmail.com>
+
+        * indent/octave.m: Tweak.
+
 2013-05-26  Aidan Gauland  <aidalgol@amuri.net>
 
         * tests/eshell.el: Rewrite tests using ERT.
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 55f8cc045f4..e5bae850589 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -2311,7 +2311,7 @@ function dep = is_architecture_dependent (nm)
       ext(end) = [];
     else
       isglob = false;           # I am a test
-                                # me too
+                                #%% me too
 ### I shall align to column 0
     endif
     pos = findstr (nm, ext);