* test/indent/ps-mode.ps: New file.

* test/automated/core-elisp-tests.el
(core-elisp-test-window-configurations): New test.
* test/indent/octave.m: Add a few more tests.
* test/indent/ruby.rb: Add one more test.

5 files changed, 46 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 4382fb905e3..5c037eb2b79 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2014-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/ruby.rb: Add one more test.
+
+        * indent/ps-mode.ps: New file.
+
+        * indent/octave.m: Add a few more tests.
+
+        * automated/core-elisp-tests.el
+        (core-elisp-test-window-configurations): New test.
+
 2014-05-26  Glenn Morris  <rgm@gnu.org>
 
         * automated/package-test.el (package-test-install-single):
diff --git a/test/automated/core-elisp-tests.el b/test/automated/core-elisp-tests.el
index 1abaa4d7dec..67ed6b65962 100644
--- a/test/automated/core-elisp-tests.el
+++ b/test/automated/core-elisp-tests.el
@@ -36,5 +36,14 @@
                          c-e-x)
                    '(1 2)))))
 
+(ert-deftest core-elisp-test-window-configurations ()
+  "Test properties of window-configurations."
+  (let ((wc (current-window-configuration)))
+    (with-current-buffer (window-buffer (frame-selected-window))
+      (push-mark)
+      (activate-mark))
+    (set-window-configuration wc)
+    (should (or (not mark-active) (mark)))))
+
 (provide 'core-elisp-tests)
 ;;; core-elisp-tests.el ends here
diff --git a/test/indent/octave.m b/test/indent/octave.m
index e5bae850589..8aab5ec03ed 100644
--- 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
diff --git a/test/indent/ps-mode.ps b/test/indent/ps-mode.ps
new file mode 100644
index 00000000000..4b4ee0f10cb
--- /dev/null
+++ b/test/indent/ps-mode.ps
@@ -0,0 +1,14 @@
+%!PS-2.0
+
+<< 23 45 >>                     %dictionary
+< 23 >                          %hex string
+<~a>a%a~>                       %base85 string
+(%)s
+(sf\(g>a)sdg)
+
+/foo {
+    <<
+        hello 2
+        3
+    >>
+} def
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 7e778798996..82cc63f9168 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -6,6 +6,10 @@ if something_wrong?             # ruby-move-to-block-skips-heredoc
   foo
 end
 
+def foo
+  %^bar^
+end
+
 # Percent literals.
 b = %Q{This is a "string"}
 c = %w!foo