Merge from origin/emacs-24

[gnu-emacs] / test / indent / octave.m

diff --git a/test/indent/octave.m b/test/indent/octave.m
index e5bae8505897134a631974b822658c557ee706a2..a7041462f7f3309f2fd1843d088073448af8e3db 100644 (file)
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -14,7 +14,15 @@ function res = tcomp (fn)
   y = 'hello';
   z = y';
 
+  ## Bug#14399.
+  vec = [...
+          one;...
+          two;...
+          three];
+
   cnty = repmat(x(:,1)(:), 10, 1);
+  x = ...
+  12
 
   pop = x(:,1:10)(:);
     ## Here and below, we test if the indentation aligns with a previous
@@ -1974,7 +1982,7 @@ function [out1, out2] = installed_packages (local_list, global_list)
   endif
 
   h1 = postpad (h1, max_name_length + 1, " ");
-  h2 = postpad (h2, max_version_length, " ");;
+  h2 = postpad (h2, max_version_length, " ");
 
   ## Print a header.
   header = sprintf("%s | %s | %s\n", h1, h2, h3);