diff options
author | Stefan Monnier <[email protected]> | 2014-05-27 10:28:07 -0400 |
---|---|---|
committer | Stefan Monnier <[email protected]> | 2014-05-27 10:28:07 -0400 |
commit | c435f506a1fd8fbf2bd22f59226ef296a3eb6ab3 (patch) | |
tree | 4394a9e9a5c5699206ad5828eb154feac19f71eb /test | |
parent | c24163d444ba9256b9efee8e7d8f1c65386b1e2a (diff) |
* 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.
Diffstat (limited to 'test')
-rw-r--r-- | test/ChangeLog | 11 | ||||
-rw-r--r-- | test/automated/core-elisp-tests.el | 9 | ||||
-rw-r--r-- | test/indent/octave.m | 8 | ||||
-rw-r--r-- | test/indent/ps-mode.ps | 14 | ||||
-rw-r--r-- | test/indent/ruby.rb | 4 |
5 files changed, 46 insertions, 0 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 4382fb905e..5c037eb2b7 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,14 @@ +2014-05-27 Stefan Monnier <[email protected]> + + * 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 <[email protected]> * 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 1abaa4d7de..67ed6b6596 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 e5bae85058..8aab5ec03e 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 0000000000..4b4ee0f10c --- /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 7e77879899..82cc63f916 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 |