Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantipov@yandex.ru

3 files changed, 28 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 70c2af66194..5b7142845e7 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-03  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-indent-electric-colon-1):
+        New test.  (Bug#18228)
+
 2014-08-29  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * automated/fns-tests.el (fns-tests-sort): New test.
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index 47dfa4b64ed..39195fd7086 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -711,6 +711,20 @@ if a:
     (should (= (python-indent-calculate-indentation) 0))
     (should (equal (python-indent-calculate-levels) '(0)))))
 
+(ert-deftest python-indent-electric-colon-1 ()
+  "Test indentation case from Bug#18228."
+  (python-tests-with-temp-buffer
+   "
+def a():
+    pass
+
+def b()
+"
+   (python-tests-look-at "def b()")
+   (goto-char (line-end-position))
+   (python-tests-self-insert ":")
+   (should (= (current-indentation) 0))))
+
 
 ;;; Navigation
 
diff --git a/test/indent/scheme.scm b/test/indent/scheme.scm
new file mode 100644
index 00000000000..84d0f6d8786
--- /dev/null
+++ b/test/indent/scheme.scm
@@ -0,0 +1,9 @@
+#!/usr/bin/scheme is this a comment?
+
+;; This one is a comment
+(a)
+#| and this one as #|well|# as this! |#
+(b)
+(cons #;(this is a
+         comment)
+ head tail)