Merge from trunk and resolve conflicts.

53 files changed, 3187 insertions, 189 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index b66c2925287..43648ad1bb1 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,110 @@
+2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * indent/octave.m: Fix encoding error in comment.  Add coding tag.
+
+2013-02-28  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * automated/python-tests.el (python-tests-with-temp-buffer): Doc fix.
+        (python-tests-with-temp-file): New macro.
+        (python-tests-shell-interpreter): New var.
+        (python-shell-get-process-name-1)
+        (python-shell-internal-get-process-name-1)
+        (python-shell-parse-command-1)
+        (python-shell-calculate-process-environment-1)
+        (python-shell-calculate-process-environment-2)
+        (python-shell-calculate-process-environment-3)
+        (python-shell-calculate-exec-path-1)
+        (python-shell-calculate-exec-path-2)
+        (python-shell-make-comint-1)
+        (python-shell-make-comint-2)
+        (python-shell-get-process-1)
+        (python-shell-get-or-create-process-1)
+        (python-shell-internal-get-or-create-process-1): New tests.
+
+2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * automated/python-tests.el: New file.
+
+2013-02-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-move-to-block-skips-percent-literal): Add depth-affecting
+        bits inside the examples.
+        (ruby-move-to-block-skips-heredoc): New test.
+        (ruby-add-log-current-method-after-inner-class): Lower
+        expectations: move point inside a method, initially.
+
+2013-02-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-move-to-block-skips-percent-literal): New test.
+
+2013-02-04  Chong Yidong  <cyd@gnu.org>
+
+        * automated/thingatpt.el: New file.
+
+2013-02-03  Chong Yidong  <cyd@gnu.org>
+
+        * automated/files.el (file-test--do-local-variables-test): Avoid
+        compilation warning message.
+
+2013-01-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-indent-spread-args-in-parens): New test.
+        * automated/ruby-mode-tests.el (ruby-block-test-example):
+        Break indentation of the do block opener and add a line inside it.
+        * automated/ruby-mode-tests.el (works-on-do, ok-with-three):
+        Adjust line numbers.
+
+2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/advice-tests.el: Split up.  Add advice-test-preactivate.
+
+2013-01-14  Glenn Morris  <rgm@gnu.org>
+
+        * automated/compile-tests.el (compile-tests--test-regexps-data):
+        Fix interpretation of gnu line.col1-col2 format.  (Bug#13335)
+
+2013-01-10  Wolfgang Jenkner  <wjenkner@inode.at>
+
+        * automated/man-tests.el: New file.
+
+2013-01-09  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+
+        * automated/undo-tests.el (undo-test0): Adjust error to code change.
+
+2013-01-08  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+
+        * automated/undo-tests.el: New file.
+
+2012-12-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-indent-after-block-in-continued-expression): New test.
+
+2012-12-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        Rename one interpolation test; add three more.
+        (ruby-with-temp-buffer): New macro, use it where appropriate.
+        (ruby-add-log-current-method-examples): Use "_" for target point.
+        Add four new tests for ruby-add-log-current-method.
+
+2012-12-11  Glenn Morris  <rgm@gnu.org>
+
+        * automated/f90.el (f90-test-bug13138): New test.
+
+2012-12-10  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * automated/inotify-test.el: New test.
+
+2012-12-02  Chong Yidong  <cyd@gnu.org>
+
+        * automated/ruby-mode-tests.el
+        (ruby-add-log-current-method-examples): Don't use loop macro, to
+        allow automated testing to work.
+
 2012-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * automated/advice-tests.el (advice-tests--data): Remove.
@@ -557,7 +664,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2008-2012  Free Software Foundation, Inc.
+  Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 5f92e21d91a..1a4e3c9b1ea 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -1,5 +1,5 @@
 # Maintenance productions for the automated test directory
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/test/automated/advice-tests.el b/test/automated/advice-tests.el
index 94f69e77e43..8beaea64cd9 100644
--- a/test/automated/advice-tests.el
+++ b/test/automated/advice-tests.el
@@ -1,6 +1,6 @@
 ;;; advice-tests.el --- Test suite for the new advice thingy.
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -21,93 +21,112 @@
 
 ;;; Code:
 
-(ert-deftest advice-tests ()
+(ert-deftest advice-tests-nadvice ()
+  "Test nadvice code."
+  (defun sm-test1 (x) (+ x 4))
+  (should (equal (sm-test1 6) 10))
+  (advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
+  (should (equal (sm-test1 6) 50))
+  (defun sm-test1 (x) (+ x 14))
+  (should (equal (sm-test1 6) 100))
+  (should (equal (null (get 'sm-test1 'defalias-fset-function)) nil))
+  (advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 5)))
+  (should (equal (sm-test1 6) 20))
+  (should (equal (get 'sm-test1 'defalias-fset-function) nil))
+
+  (advice-add 'sm-test3 :around
+              (lambda (f &rest args) `(toto ,(apply f args)))
+              '((name . wrap-with-toto)))
+  (defmacro sm-test3 (x) `(call-test3 ,x))
+  (should (equal (macroexpand '(sm-test3 56)) '(toto (call-test3 56)))))
+
+(ert-deftest advice-tests-advice ()
   "Test advice code."
-  (with-temp-buffer
-    (defun sm-test1 (x) (+ x 4))
-    (should (equal (sm-test1 6) 10))
-    (advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
-    (should (equal (sm-test1 6) 50))
-    (defun sm-test1 (x) (+ x 14))
-    (should (equal (sm-test1 6) 100))
-    (should (equal (null (get 'sm-test1 'defalias-fset-function)) nil))
-    (advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 5)))
-    (should (equal (sm-test1 6) 20))
-    (should (equal (null (get 'sm-test1 'defalias-fset-function)) t))
-
-    (defun sm-test2 (x) (+ x 4))
-    (should (equal (sm-test2 6) 10))
-    (defadvice sm-test2 (around sm-test activate)
-       ad-do-it (setq ad-return-value (* ad-return-value 5)))
-    (should (equal (sm-test2 6) 50))
-    (ad-deactivate 'sm-test2)
-    (should (equal (sm-test2 6) 10))
-    (ad-activate 'sm-test2)
-    (should (equal (sm-test2 6) 50))
-    (defun sm-test2 (x) (+ x 14))
-    (should (equal (sm-test2 6) 100))
-    (should (equal (null (get 'sm-test2 'defalias-fset-function)) nil))
-    (ad-remove-advice 'sm-test2 'around 'sm-test)
-    (should (equal (sm-test2 6) 100))
-    (ad-activate 'sm-test2)
-    (should (equal (sm-test2 6) 20))
-    (should (equal (null (get 'sm-test2 'defalias-fset-function)) t))
-
-    (advice-add 'sm-test3 :around
-                 (lambda (f &rest args) `(toto ,(apply f args)))
-                 '((name . wrap-with-toto)))
-     (defmacro sm-test3 (x) `(call-test3 ,x))
-    (should (equal (macroexpand '(sm-test3 56)) '(toto (call-test3 56))))
-
-    (defadvice sm-test4 (around wrap-with-toto activate)
-       ad-do-it (setq ad-return-value `(toto ,ad-return-value)))
-     (defmacro sm-test4 (x) `(call-test4 ,x))
-    (should (equal (macroexpand '(sm-test4 56)) '(toto (call-test4 56))))
-    (defmacro sm-test4 (x) `(call-testq ,x))
-    (should (equal (macroexpand '(sm-test4 56)) '(toto (call-testq 56))))
-
-    ;; Combining old style and new style advices.
-    (defun sm-test5 (x) (+ x 4))
-    (should (equal (sm-test5 6) 10))
-    (advice-add 'sm-test5 :around (lambda (f y) (* (funcall f y) 5)))
-    (should (equal (sm-test5 6) 50))
-    (defadvice sm-test5 (around test activate)
-       ad-do-it (setq ad-return-value (+ ad-return-value 0.1)))
-    (should (equal (sm-test5 5) 45.1))
-    (ad-deactivate 'sm-test5)
-    (should (equal (sm-test5 6) 50))
-    (ad-activate 'sm-test5)
-    (should (equal (sm-test5 6) 50.1))
-    (defun sm-test5 (x) (+ x 14))
-    (should (equal (sm-test5 6) 100.1))
-    (advice-remove 'sm-test5 (lambda (f y) (* (funcall f y) 5)))
-    (should (equal (sm-test5 6) 20.1))
-
-    ;; This used to signal an error (bug#12858).
-    (autoload 'sm-test6 "foo")
-     (defadvice sm-test6 (around test activate)
-       ad-do-it)
-
-    ;; Check interaction between advice and called-interactively-p.
-    (defun sm-test7 (&optional x) (interactive) (+ (or x 7) 4))
-    (advice-add 'sm-test7 :around
-                (lambda (f &rest args)
-                  (list (cons 1 (called-interactively-p)) (apply f args))))
-    (should (equal (sm-test7) '((1 . nil) 11)))
-    (should (equal (call-interactively 'sm-test7) '((1 . t) 11)))
-    (let ((smi 7))
-      (advice-add 'sm-test7 :before
-                  (lambda (&rest args)
-                    (setq smi (called-interactively-p))))
-      (should (equal (list (sm-test7) smi)
-                     '(((1 . nil) 11) nil)))
-      (should (equal (list (call-interactively 'sm-test7) smi)
-                      '(((1 . t) 11) t))))
-    (advice-add 'sm-test7 :around
-                (lambda (f &rest args)
-                  (cons (cons 2 (called-interactively-p)) (apply f args))))
-    (should (equal (call-interactively 'sm-test7) '((2 . t) (1 . t) 11)))
-    ))
+  (defun sm-test2 (x) (+ x 4))
+  (should (equal (sm-test2 6) 10))
+  (defadvice sm-test2 (around sm-test activate)
+    ad-do-it (setq ad-return-value (* ad-return-value 5)))
+  (should (equal (sm-test2 6) 50))
+  (ad-deactivate 'sm-test2)
+  (should (equal (sm-test2 6) 10))
+  (ad-activate 'sm-test2)
+  (should (equal (sm-test2 6) 50))
+  (defun sm-test2 (x) (+ x 14))
+  (should (equal (sm-test2 6) 100))
+  (should (equal (null (get 'sm-test2 'defalias-fset-function)) nil))
+  (ad-remove-advice 'sm-test2 'around 'sm-test)
+  (should (equal (sm-test2 6) 100))
+  (ad-activate 'sm-test2)
+  (should (equal (sm-test2 6) 20))
+  (should (equal (null (get 'sm-test2 'defalias-fset-function)) t))
+
+  (defadvice sm-test4 (around wrap-with-toto activate)
+    ad-do-it (setq ad-return-value `(toto ,ad-return-value)))
+  (defmacro sm-test4 (x) `(call-test4 ,x))
+  (should (equal (macroexpand '(sm-test4 56)) '(toto (call-test4 56))))
+  (defmacro sm-test4 (x) `(call-testq ,x))
+  (should (equal (macroexpand '(sm-test4 56)) '(toto (call-testq 56))))
+
+  ;; This used to signal an error (bug#12858).
+  (autoload 'sm-test6 "foo")
+  (defadvice sm-test6 (around test activate)
+    ad-do-it))
+
+(ert-deftest advice-tests-combination ()
+  "Combining old style and new style advices."
+  (defun sm-test5 (x) (+ x 4))
+  (should (equal (sm-test5 6) 10))
+  (advice-add 'sm-test5 :around (lambda (f y) (* (funcall f y) 5)))
+  (should (equal (sm-test5 6) 50))
+  (defadvice sm-test5 (around test activate)
+    ad-do-it (setq ad-return-value (+ ad-return-value 0.1)))
+  (should (equal (sm-test5 5) 45.1))
+  (ad-deactivate 'sm-test5)
+  (should (equal (sm-test5 6) 50))
+  (ad-activate 'sm-test5)
+  (should (equal (sm-test5 6) 50.1))
+  (defun sm-test5 (x) (+ x 14))
+  (should (equal (sm-test5 6) 100.1))
+  (advice-remove 'sm-test5 (lambda (f y) (* (funcall f y) 5)))
+  (should (equal (sm-test5 6) 20.1)))
+
+(ert-deftest advice-test-called-interactively-p ()
+  "Check interaction between advice and called-interactively-p."
+  (defun sm-test7 (&optional x) (interactive) (+ (or x 7) 4))
+  (advice-add 'sm-test7 :around
+              (lambda (f &rest args)
+                (list (cons 1 (called-interactively-p)) (apply f args))))
+  (should (equal (sm-test7) '((1 . nil) 11)))
+  (should (equal (call-interactively 'sm-test7) '((1 . t) 11)))
+  (let ((smi 7))
+    (advice-add 'sm-test7 :before
+                (lambda (&rest args)
+                  (setq smi (called-interactively-p))))
+    (should (equal (list (sm-test7) smi)
+                   '(((1 . nil) 11) nil)))
+    (should (equal (list (call-interactively 'sm-test7) smi)
+                   '(((1 . t) 11) t))))
+  (advice-add 'sm-test7 :around
+              (lambda (f &rest args)
+                (cons (cons 2 (called-interactively-p)) (apply f args))))
+  (should (equal (call-interactively 'sm-test7) '((2 . t) (1 . t) 11))))
+
+(ert-deftest advice-test-interactive ()
+  "Check handling of interactive spec."
+  (defun sm-test8 (a) (interactive "p") a)
+  (defadvice sm-test8 (before adv1 activate) nil)
+  (defadvice sm-test8 (before adv2 activate) (interactive "P") nil)
+  (should (equal (interactive-form 'sm-test8) '(interactive "P"))))
+
+(ert-deftest advice-test-preactivate ()
+  (should (equal (null (get 'sm-test9 'defalias-fset-function)) t))
+  (defun sm-test9 (a) (interactive "p") a)
+  (should (equal (null (get 'sm-test9 'defalias-fset-function)) t))
+  (defadvice sm-test9 (before adv1 pre act protect compile) nil)
+  (should (equal (null (get 'sm-test9 'defalias-fset-function)) nil))
+  (defadvice sm-test9 (before adv2 pre act protect compile)
+    (interactive "P") nil)
+  (should (equal (interactive-form 'sm-test9) '(interactive "P"))))
 
 ;; Local Variables:
 ;; no-byte-compile: t
diff --git a/test/automated/bytecomp-tests.el b/test/automated/bytecomp-tests.el
index b7ec79fd51c..96e4bed5fd0 100644
--- a/test/automated/bytecomp-tests.el
+++ b/test/automated/bytecomp-tests.el
@@ -1,6 +1,6 @@
 ;;; bytecomp-testsuite.el
 
-;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 ;; Author:         Shigeru Fukaya <shigeru.fukaya@gmail.com>
 ;; Created:        November 2008
diff --git a/test/automated/comint-testsuite.el b/test/automated/comint-testsuite.el
index 7317c107d59..dd3ebb03d2a 100644
--- a/test/automated/comint-testsuite.el
+++ b/test/automated/comint-testsuite.el
@@ -1,6 +1,6 @@
 ;;; comint-testsuite.el
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index 9415ee3a17e..682867d1178 100644
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -1,6 +1,6 @@
 ;;; compile-tests.el --- Test suite for font parsing.
 
-;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
@@ -176,8 +176,10 @@
     ("foo.c:8.23: note: message" 1 23 8 "foo.c")
     ("foo.c:8.23: info: message" 1 23 8 "foo.c")
     ("foo.c:8:23:information: message" 1 23 8 "foo.c")
-    ("foo.c:8.23-45: Informational: message" 1 (23 . nil) (8 . 45) "foo.c")
+    ("foo.c:8.23-45: Informational: message" 1 (23 . 46) (8 . nil) "foo.c")
     ("foo.c:8-23: message" 1 nil (8 . 23) "foo.c")
+    ;; The next one is not in the GNU standards AFAICS.
+    ;; Here we seem to interpret it as LINE1-LINE2.COL2.
     ("foo.c:8-45.3: message" 1 (nil . 4) (8 . 45) "foo.c")
     ("foo.c:8.23-9.1: message" 1 (23 . 2) (8 . 9) "foo.c")
     ("jade:dbcommon.dsl:133:17:E: missing argument for function call"
diff --git a/test/automated/ert-tests.el b/test/automated/ert-tests.el
index 1aef1921871..0c3c3692c1d 100644
--- a/test/automated/ert-tests.el
+++ b/test/automated/ert-tests.el
@@ -1,6 +1,6 @@
 ;;; ert-tests.el --- ERT's self-tests  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
 
 ;; Author: Christian Ohler <ohler@gnu.org>
 
diff --git a/test/automated/ert-x-tests.el b/test/automated/ert-x-tests.el
index e03c8475442..dc67fe34833 100644
--- a/test/automated/ert-x-tests.el
+++ b/test/automated/ert-x-tests.el
@@ -1,6 +1,6 @@
 ;;; ert-x-tests.el --- Tests for ert-x.el
 
-;; Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
 
 ;; Author: Phil Hagelberg
 ;;         Christian Ohler <ohler@gnu.org>
diff --git a/test/automated/f90.el b/test/automated/f90.el
index 25b77f07ad3..dd627605df6 100644
--- a/test/automated/f90.el
+++ b/test/automated/f90.el
@@ -1,6 +1,6 @@
 ;;; f90.el --- tests for progmodes/f90.el
 
-;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Glenn Morris <rgm@gnu.org>
 
@@ -154,5 +154,23 @@ end module modname")
     (f90-indent-line)
     (should (= 0 (current-indentation)))))
 
+(ert-deftest f90-test-bug13138 ()
+  "Test for http://debbugs.gnu.org/13138 ."
+  (with-temp-buffer
+    (f90-mode)
+    (insert "program prog
+  integer :: i = &
+#ifdef foo
+       & 1
+#else
+       & 2
+#endif
+
+  write(*,*) i
+end program prog")
+    (goto-char (point-min))
+    (forward-line 2)
+    (f90-indent-subprogram)
+    (should (= 0 (current-indentation)))))
 
 ;;; f90.el ends here
diff --git a/test/automated/files.el b/test/automated/files.el
index b6011395bfd..f2d2192a420 100644
--- a/test/automated/files.el
+++ b/test/automated/files.el
@@ -1,6 +1,6 @@
 ;;; files.el --- tests for file handling.
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -23,9 +23,9 @@
 
 ;; Set to t if the local variable was set, `query' if the query was
 ;; triggered.
-(defvar files-test-result)
+(defvar files-test-result nil)
 
-(defvar files-test-safe-result)
+(defvar files-test-safe-result nil)
 (put 'files-test-safe-result 'safe-local-variable 'booleanp)
 
 (defun files-test-fun1 ()
@@ -123,11 +123,11 @@ form.")
 (defun file-test--do-local-variables-test (str test-settings)
   (with-temp-buffer
     (insert str)
+    (setq files-test-result nil
+          files-test-safe-result nil)
     (let ((enable-local-variables (nth 0 test-settings))
           (enable-local-eval      (nth 1 test-settings))
-          (files-test-result nil)
-          (files-test-queried nil)
-          (files-test-safe-result nil))
+          (files-test-queried nil))
       (hack-local-variables)
       (eval (nth 2 test-settings)))))
 
diff --git a/test/automated/font-parse-tests.el b/test/automated/font-parse-tests.el
index 6aeaee4adce..3a216a2b715 100644
--- a/test/automated/font-parse-tests.el
+++ b/test/automated/font-parse-tests.el
@@ -1,6 +1,6 @@
 ;;; font-parse-tests.el --- Test suite for font parsing.
 
-;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/automated/gnus-tests.el b/test/automated/gnus-tests.el
index 3b5340bcdd3..a27075b53f1 100644
--- a/test/automated/gnus-tests.el
+++ b/test/automated/gnus-tests.el
@@ -1,6 +1,6 @@
 ;;; gnus-tests.el --- Wrapper for the Gnus tests
 
-;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 58b8379bb11..bca462da4d9 100644
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -1,6 +1,6 @@
 ;; icalendar-tests.el --- Test suite for icalendar.el
 
-;; Copyright (C) 2005, 2008-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        March 2005
diff --git a/test/automated/inotify-test.el b/test/automated/inotify-test.el
new file mode 100644
index 00000000000..175f262b282
--- /dev/null
+++ b/test/automated/inotify-test.el
@@ -0,0 +1,60 @@
+;;; inotify-tests.el --- Test suite for inotify. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
+
+;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
+;; Keywords:       internal
+;; Human-Keywords: internal
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(when (featurep 'inotify)
+
+  ;; (ert-deftest filewatch-file-watch-aspects-check ()
+  ;;   "Test whether `file-watch' properly checks the aspects."
+  ;;   (let ((temp-file (make-temp-file "filewatch-aspects")))
+  ;;     (should (stringp temp-file))
+  ;;     (should-error (file-watch temp-file 'wrong nil)
+  ;;                   :type 'error)
+  ;;     (should-error (file-watch temp-file '(modify t) nil)
+  ;;                   :type 'error)
+  ;;     (should-error (file-watch temp-file '(modify all-modify) nil)
+  ;;                   :type 'error)
+  ;;     (should-error (file-watch temp-file '(access wrong modify) nil)
+  ;;                   :type 'error)))
+
+  (ert-deftest inotify-file-watch-simple ()
+    "Test if watching a normal file works."
+    (let ((temp-file (make-temp-file "inotify-simple"))
+           (events 0))
+      (let ((wd
+             (inotify-add-watch temp-file t (lambda (ev)
+                                              (setq events (1+ events))))))
+        (unwind-protect
+            (progn
+              (with-temp-file temp-file
+                (insert "Foo\n"))
+              (sit-for 5) ;; Hacky. Wait for 5s until events are processed
+              (should (> events 0)))
+          (inotify-rm-watch wd)))))
+)
+
+(provide 'inotify-tests)
+;;; inotify-tests.el ends here.
diff --git a/test/automated/lexbind-tests.el b/test/automated/lexbind-tests.el
index 22668bc7d02..0fed946182e 100644
--- a/test/automated/lexbind-tests.el
+++ b/test/automated/lexbind-tests.el
@@ -1,6 +1,6 @@
 ;;; lexbind-tests.el --- Testing the lexbind byte-compiler
 
-;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
diff --git a/test/automated/man-tests.el b/test/automated/man-tests.el
new file mode 100644
index 00000000000..8a2ec953002
--- /dev/null
+++ b/test/automated/man-tests.el
@@ -0,0 +1,118 @@
+;;; man-tests.el --- Test suite for man.
+
+;; Copyright (C) 2013  Free Software Foundation, Inc.
+
+;; Author: Wolfgang Jenkner <wjenkner@inode.at>
+;; Keywords: help, internal, unix
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+(require 'man)
+
+(defconst man-tests-parse-man-k-tests
+  '(;; GNU/Linux: man-db-2.6.1
+    ("\
+sin (3)              - sine function
+sinf (3)             - sine function
+sinl (3)             - sine function"
+     . (#("sin(3)" 0 6 (help-echo "sine function")) #("sinf(3)" 0 7 (help-echo "sine function")) #("sinl(3)" 0 7 (help-echo "sine function"))))
+    ;; GNU/Linux: man-1.6g
+    ("\
+sin                  (3)  - sine function
+sinf [sin]           (3)  - sine function
+sinl [sin]           (3)  - sine function"
+     . (#("sin(3)" 0 6 (help-echo "sine function")) #("sinf(3)" 0 7 (help-echo "sine function")) #("sinl(3)" 0 7 (help-echo "sine function"))))
+    ;; FreeBSD 9
+    ("\
+sin(3), sinf(3), sinl(3) - sine functions"
+     . (#("sin(3)" 0 6 (help-echo "sine functions")) #("sinf(3)" 0 7 (help-echo "sine functions")) #("sinl(3)" 0 7 (help-echo "sine functions"))))
+    ;; SunOS, Solaris
+    ;; http://docs.oracle.com/cd/E19455-01/805-6331/usradm-7/index.html
+    ;; SunOS 4
+    ("\
+tset, reset (1)    - establish or restore terminal characteristics"
+     . (#("tset(1)" 0 7 (help-echo "establish or restore terminal characteristics")) #("reset(1)" 0 8 (help-echo "establish or restore terminal characteristics"))))
+    ;; SunOS 5.7, Solaris
+    ("\
+reset  tset (1b)   - establish or restore terminal characteristics
+tset   tset (1b)   - establish or restore terminal characteristics"
+     . (#("reset(1b)" 0 8 (help-echo "establish or restore terminal characteristics")) #("tset(1b)" 0 7 (help-echo "establish or restore terminal characteristics"))))
+    ;; Minix 3
+    ;; http://www.minix3.org/manpages/html5/whatis.html
+    ("\
+cawf, nroff (1) - C version of the nroff-like, Amazingly Workable (text) Formatter
+whatis (5) - database of online manual pages"
+     . (#("cawf(1)" 0 7 (help-echo "C version of the nroff-like, Amazingly Workable (text) Formatter")) #("nroff(1)" 0 8 (help-echo "C version of the nroff-like, Amazingly Workable (text) Formatter")) #("whatis(5)" 0 9 (help-echo "database of online manual pages"))))
+    ;; HP-UX
+    ;; http://docstore.mik.ua/manuals/hp-ux/en/B2355-60130/man.1.html
+    ;; Assuming that the line break in the zgrep description was
+    ;; introduced by the man page formatting.
+    ("\
+grep, egrep, fgrep (1) - search a file for a pattern
+zgrep(1) - search possibly compressed files for a regular expression"
+     . (#("grep(1)" 0 7 (help-echo "search a file for a pattern")) #("egrep(1)" 0 8 (help-echo "search a file for a pattern")) #("fgrep(1)" 0 8 (help-echo "search a file for a pattern")) #("zgrep(1)" 0 8 (help-echo "search possibly compressed files for a regular expression"))))
+    ;; AIX
+    ;; http://pic.dhe.ibm.com/infocenter/aix/v7r1/topic/com.ibm.aix.cmds/doc/aixcmds6/whatis.htm
+    ("\
+ls(1)  -Displays the contents of a directory."
+    . (#("ls(1)" 0 5 (help-echo "Displays the contents of a directory."))))
+    ;; https://www.ibm.com/developerworks/mydeveloperworks/blogs/cgaix/entry/catman_0703_102_usr_lbin_mkwhatis_the_error_number_is_1?lang=en
+    ("\
+loopmount(1)    - Associate an image file to a loopback device."
+     . (#("loopmount(1)" 0 12 (help-echo "Associate an image file to a loopback device."))))
+    )
+  "List of tests for `Man-parse-man-k'.
+Each element is a cons cell whose car is a string containing
+man -k output.  That should result in the table which is stored
+in the cdr of the element.")
+
+(defun man-tests-name-equal-p (name description string)
+  (and (equal name string)
+       (not (next-single-property-change 0 'help-echo string))
+       (equal (get-text-property 0 'help-echo string) description)))
+
+(defun man-tests-parse-man-k-test-case (test)
+  (let ((temp-buffer (get-buffer-create " *test-man*"))
+        (man-k-output (car test)))
+    (unwind-protect
+        (save-window-excursion
+          (with-current-buffer temp-buffer
+            (erase-buffer)
+            (insert man-k-output)
+            (let ((result (Man-parse-man-k))
+                  (checklist (cdr test)))
+              (while (and checklist result
+                          (man-tests-name-equal-p
+                           (car checklist)
+                           (get-text-property 0 'help-echo
+                                              (car checklist))
+                           (pop result)))
+                (pop checklist))
+              (and (null checklist) (null result)))))
+      (and (buffer-name temp-buffer)
+           (kill-buffer temp-buffer)))))
+
+(ert-deftest man-tests ()
+  "Test man."
+  (dolist (test man-tests-parse-man-k-tests)
+    (should (man-tests-parse-man-k-test-case test))))
+
+(provide 'man-tests)
+
+;;; man-tests.el ends here
diff --git a/test/automated/newsticker-tests.el b/test/automated/newsticker-tests.el
index 5b60535e463..4fe656e6929 100644
--- a/test/automated/newsticker-tests.el
+++ b/test/automated/newsticker-tests.el
@@ -1,6 +1,6 @@
 ;;; newsticker-testsuite.el --- Test suite for newsticker.
 
-;; Copyright (C) 2003-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Keywords:    News, RSS, Atom
diff --git a/test/automated/occur-tests.el b/test/automated/occur-tests.el
index 5fe9722d4e7..7cc4df6bffa 100644
--- a/test/automated/occur-tests.el
+++ b/test/automated/occur-tests.el
@@ -1,6 +1,6 @@
 ;;; occur-tests.el --- Test suite for occur.
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
 
 ;; Author: Juri Linkov <juri@jurta.org>
 ;; Keywords: matching, internal
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
new file mode 100644
index 00000000000..ab8eb4816d3
--- /dev/null
+++ b/test/automated/python-tests.el
@@ -0,0 +1,2216 @@
+;;; python-tests.el --- Test suite for python.el
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'python)
+
+(defmacro python-tests-with-temp-buffer (contents &rest body)
+  "Create a `python-mode' enabled temp buffer with CONTENTS.
+BODY is code to be executed within the temp buffer.  Point is
+always located at the beginning of buffer."
+  (declare (indent 1) (debug t))
+  `(with-temp-buffer
+     (python-mode)
+     (insert ,contents)
+     (goto-char (point-min))
+     ,@body))
+
+(defmacro python-tests-with-temp-file (contents &rest body)
+  "Create a `python-mode' enabled file with CONTENTS.
+BODY is code to be executed within the temp buffer.  Point is
+always located at the beginning of buffer."
+  (declare (indent 1) (debug t))
+  `(let* ((temp-file (concat (make-temp-file "python-tests") ".py"))
+          (buffer (find-file-noselect temp-file)))
+     (unwind-protect
+         (with-current-buffer buffer
+           (python-mode)
+           (insert ,contents)
+           (goto-char (point-min))
+           ,@body)
+       (and buffer (kill-buffer buffer)))))
+
+(defun python-tests-look-at (string &optional num restore-point)
+  "Move point at beginning of STRING in the current buffer.
+Optional argument NUM defaults to 1 and is an integer indicating
+how many occurrences must be found, when positive the search is
+done forwards, otherwise backwards.  When RESTORE-POINT is
+non-nil the point is not moved but the position found is still
+returned.  When searching forward and point is already looking at
+STRING, it is skipped so the next STRING occurrence is selected."
+  (let* ((num (or num 1))
+         (starting-point (point))
+         (string (regexp-quote string))
+         (search-fn (if (> num 0) #'re-search-forward #'re-search-backward))
+         (deinc-fn (if (> num 0) #'1- #'1+))
+         (found-point))
+    (prog2
+        (catch 'exit
+          (while (not (= num 0))
+            (when (and (> num 0)
+                       (looking-at string))
+              ;; Moving forward and already looking at STRING, skip it.
+              (forward-char (length (match-string-no-properties 0))))
+            (and (not (funcall search-fn string nil t))
+                 (throw 'exit t))
+            (when (> num 0)
+              ;; `re-search-forward' leaves point at the end of the
+              ;; occurrence, move back so point is at the beginning
+              ;; instead.
+              (forward-char (- (length (match-string-no-properties 0)))))
+            (setq
+             num (funcall deinc-fn num)
+             found-point (point))))
+        found-point
+      (and restore-point (goto-char starting-point)))))
+
+
+;;; Tests for your tests, so you can test while you test.
+
+(ert-deftest python-tests-look-at-1 ()
+  "Test forward movement."
+  (python-tests-with-temp-buffer
+   "Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+sed do eiusmod tempor incididunt ut labore et dolore magna
+aliqua."
+   (let ((expected (save-excursion
+                     (dotimes (i 3)
+                       (re-search-forward "et" nil t))
+                     (forward-char -2)
+                     (point))))
+     (should (= (python-tests-look-at "et" 3 t) expected))
+     ;; Even if NUM is bigger than found occurrences the point of last
+     ;; one should be returned.
+     (should (= (python-tests-look-at "et" 6 t) expected))
+     ;; If already looking at STRING, it should skip it.
+     (dotimes (i 2) (re-search-forward "et"))
+     (forward-char -2)
+     (should (= (python-tests-look-at "et") expected)))))
+
+(ert-deftest python-tests-look-at-2 ()
+  "Test backward movement."
+  (python-tests-with-temp-buffer
+   "Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+sed do eiusmod tempor incididunt ut labore et dolore magna
+aliqua."
+   (let ((expected
+          (save-excursion
+            (re-search-forward "et" nil t)
+            (forward-char -2)
+            (point))))
+     (dotimes (i 3)
+       (re-search-forward "et" nil t))
+     (should (= (python-tests-look-at "et" -3 t) expected))
+     (should (= (python-tests-look-at "et" -6 t) expected)))))
+
+
+;;; Bindings
+
+
+;;; Python specialized rx
+
+
+;;; Font-lock and syntax
+
+
+;;; Indentation
+
+;; See: http://www.python.org/dev/peps/pep-0008/#indentation
+
+(ert-deftest python-indent-pep8-1 ()
+  "First pep8 case."
+  (python-tests-with-temp-buffer
+   "# Aligned with opening delimiter
+foo = long_function_name(var_one, var_two,
+                         var_three, var_four)
+"
+   (should (eq (car (python-indent-context)) 'no-indent))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "foo = long_function_name(var_one, var_two,")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "var_three, var_four)")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 25))))
+
+(ert-deftest python-indent-pep8-2 ()
+  "Second pep8 case."
+  (python-tests-with-temp-buffer
+   "# More indentation included to distinguish this from the rest.
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (should (eq (car (python-indent-context)) 'no-indent))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "def long_function_name(")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "var_one, var_two, var_three,")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "var_four):")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "print (var_one)")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 4))))
+
+(ert-deftest python-indent-pep8-3 ()
+  "Third pep8 case."
+  (python-tests-with-temp-buffer
+   "# Extra indentation is not necessary.
+foo = long_function_name(
+  var_one, var_two,
+  var_three, var_four)
+"
+   (should (eq (car (python-indent-context)) 'no-indent))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "foo = long_function_name(")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "var_one, var_two,")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "var_three, var_four)")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))))
+
+(ert-deftest python-indent-inside-paren-1 ()
+  "The most simple inside-paren case that shouldn't fail."
+  (python-tests-with-temp-buffer
+   "
+data = {
+    'key':
+    {
+        'objlist': [
+            {
+                'pk': 1,
+                'name': 'first',
+            },
+            {
+                'pk': 2,
+                'name': 'second',
+            }
+        ]
+    }
+}
+"
+   (python-tests-look-at "data = {")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "'key':")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "{")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "'objlist': [")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "{")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 12))
+   (python-tests-look-at "'pk': 1,")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 16))
+   (python-tests-look-at "'name': 'first',")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 16))
+   (python-tests-look-at "},")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 12))
+   (python-tests-look-at "{")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 12))
+   (python-tests-look-at "'pk': 2,")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 16))
+   (python-tests-look-at "'name': 'second',")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 16))
+   (python-tests-look-at "}")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 12))
+   (python-tests-look-at "]")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "}")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "}")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 0))))
+
+(ert-deftest python-indent-inside-paren-2 ()
+  "Another more compact paren group style."
+  (python-tests-with-temp-buffer
+   "
+data = {'key': {
+    'objlist': [
+        {'pk': 1,
+         'name': 'first'},
+        {'pk': 2,
+         'name': 'second'}
+    ]
+}}
+"
+   (python-tests-look-at "data = {")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "'objlist': [")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "{'pk': 1,")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "'name': 'first'},")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 9))
+   (python-tests-look-at "{'pk': 2,")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "'name': 'second'}")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 9))
+   (python-tests-look-at "]")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "}}")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "}")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 0))))
+
+(ert-deftest python-indent-after-block-1 ()
+  "The most simple after-block case that shouldn't fail."
+  (python-tests-with-temp-buffer
+   "
+def foo(a, b, c=True):
+"
+   (should (eq (car (python-indent-context)) 'no-indent))
+   (should (= (python-indent-calculate-indentation) 0))
+   (goto-char (point-max))
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 4))))
+
+(ert-deftest python-indent-after-block-2 ()
+  "A weird (malformed) multiline block statement."
+  (python-tests-with-temp-buffer
+   "
+def foo(a, b, c={
+    'a':
+}):
+"
+   (goto-char (point-max))
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 4))))
+
+(ert-deftest python-indent-dedenters-1 ()
+  "Check all dedenters."
+  (python-tests-with-temp-buffer
+   "
+def foo(a, b, c):
+    if a:
+        print (a)
+    elif b:
+        print (b)
+    else:
+        try:
+            print (c.pop())
+        except (IndexError, AttributeError):
+            print (c)
+        finally:
+            print ('nor a, nor b are true')
+"
+   (python-tests-look-at "if a:")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "print (a)")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "elif b:")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "print (b)")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "else:")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "try:")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "print (c.pop())")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 12))
+   (python-tests-look-at "except (IndexError, AttributeError):")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "print (c)")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 12))
+   (python-tests-look-at "finally:")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 8))
+   (python-tests-look-at "print ('nor a, nor b are true')")
+   (should (eq (car (python-indent-context)) 'after-beginning-of-block))
+   (should (= (python-indent-calculate-indentation) 12))))
+
+(ert-deftest python-indent-after-backslash-1 ()
+  "The most common case."
+  (python-tests-with-temp-buffer
+   "
+from foo.bar.baz import something, something_1 \\\\
+    something_2 something_3, \\\\
+    something_4, something_5
+"
+   (python-tests-look-at "from foo.bar.baz import something, something_1")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at "something_2 something_3,")
+   (should (eq (car (python-indent-context)) 'after-backslash))
+   (should (= (python-indent-calculate-indentation) 4))
+   (python-tests-look-at "something_4, something_5")
+   (should (eq (car (python-indent-context)) 'after-backslash))
+   (should (= (python-indent-calculate-indentation) 4))
+   (goto-char (point-max))
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))))
+
+(ert-deftest python-indent-after-backslash-2 ()
+  "A pretty extreme complicated case."
+  (python-tests-with-temp-buffer
+   "
+objects = Thing.objects.all() \\\\
+                       .filter(
+                           type='toy',
+                           status='bought'
+                       ) \\\\
+                       .aggregate(
+                           Sum('amount')
+                       ) \\\\
+                       .values_list()
+"
+   (python-tests-look-at "objects = Thing.objects.all()")
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))
+   (python-tests-look-at ".filter(")
+   (should (eq (car (python-indent-context)) 'after-backslash))
+   (should (= (python-indent-calculate-indentation) 23))
+   (python-tests-look-at "type='toy',")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 27))
+   (python-tests-look-at "status='bought'")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 27))
+   (python-tests-look-at ") \\\\")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 23))
+   (python-tests-look-at ".aggregate(")
+   (should (eq (car (python-indent-context)) 'after-backslash))
+   (should (= (python-indent-calculate-indentation) 23))
+   (python-tests-look-at "Sum('amount')")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 27))
+   (python-tests-look-at ") \\\\")
+   (should (eq (car (python-indent-context)) 'inside-paren))
+   (should (= (python-indent-calculate-indentation) 23))
+   (python-tests-look-at ".values_list()")
+   (should (eq (car (python-indent-context)) 'after-backslash))
+   (should (= (python-indent-calculate-indentation) 23))
+   (forward-line 1)
+   (should (eq (car (python-indent-context)) 'after-line))
+   (should (= (python-indent-calculate-indentation) 0))))
+
+
+;;; Navigation
+
+(ert-deftest python-nav-beginning-of-defun-1 ()
+  (python-tests-with-temp-buffer
+   "
+def decoratorFunctionWithArguments(arg1, arg2, arg3):
+    '''print decorated function call data to stdout.
+
+    Usage:
+
+    @decoratorFunctionWithArguments('arg1', 'arg2')
+    def func(a, b, c=True):
+        pass
+    '''
+
+    def wwrap(f):
+        print 'Inside wwrap()'
+        def wrapped_f(*args):
+            print 'Inside wrapped_f()'
+            print 'Decorator arguments:', arg1, arg2, arg3
+            f(*args)
+            print 'After f(*args)'
+        return wrapped_f
+    return wwrap
+"
+   (python-tests-look-at "return wrap")
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def wrapped_f(*args):" -1)
+                (beginning-of-line)
+                (point))))
+   (python-tests-look-at "def wrapped_f(*args):" -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def wwrap(f):" -1)
+                (beginning-of-line)
+                (point))))
+   (python-tests-look-at "def wwrap(f):" -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def decoratorFunctionWithArguments" -1)
+                (beginning-of-line)
+                (point))))))
+
+(ert-deftest python-nav-beginning-of-defun-2 ()
+  (python-tests-with-temp-buffer
+   "
+class C(object):
+
+    def m(self):
+        self.c()
+
+        def b():
+            pass
+
+        def a():
+            pass
+
+    def c(self):
+        pass
+"
+   ;; Nested defuns, are handled with care.
+   (python-tests-look-at "def c(self):")
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def m(self):" -1)
+                (beginning-of-line)
+                (point))))
+   ;; Defuns on same levels should be respected.
+   (python-tests-look-at "def a():" -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def b():" -1)
+                (beginning-of-line)
+                (point))))
+   ;; Jump to a top level defun.
+   (python-tests-look-at "def b():" -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def m(self):" -1)
+                (beginning-of-line)
+                (point))))
+   ;; Jump to a top level defun again.
+   (python-tests-look-at "def m(self):" -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "class C(object):" -1)
+                (beginning-of-line)
+                (point))))))
+
+(ert-deftest python-nav-end-of-defun-1 ()
+  (python-tests-with-temp-buffer
+   "
+class C(object):
+
+    def m(self):
+        self.c()
+
+        def b():
+            pass
+
+        def a():
+            pass
+
+    def c(self):
+        pass
+"
+   (should (= (save-excursion
+                (python-tests-look-at "class C(object):")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (point-max))))
+   (should (= (save-excursion
+                (python-tests-look-at "def m(self):")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def c(self):")
+                (forward-line -1)
+                (point))))
+   (should (= (save-excursion
+                (python-tests-look-at "def b():")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "def b():")
+                (forward-line 2)
+                (point))))
+   (should (= (save-excursion
+                (python-tests-look-at "def c(self):")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (point-max))))))
+
+(ert-deftest python-nav-end-of-defun-2 ()
+  (python-tests-with-temp-buffer
+   "
+def decoratorFunctionWithArguments(arg1, arg2, arg3):
+    '''print decorated function call data to stdout.
+
+    Usage:
+
+    @decoratorFunctionWithArguments('arg1', 'arg2')
+    def func(a, b, c=True):
+        pass
+    '''
+
+    def wwrap(f):
+        print 'Inside wwrap()'
+        def wrapped_f(*args):
+            print 'Inside wrapped_f()'
+            print 'Decorator arguments:', arg1, arg2, arg3
+            f(*args)
+            print 'After f(*args)'
+        return wrapped_f
+    return wwrap
+"
+   (should (= (save-excursion
+                (python-tests-look-at "def decoratorFunctionWithArguments")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (point-max))))
+   (should (= (save-excursion
+                (python-tests-look-at "@decoratorFunctionWithArguments")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (point-max))))
+   (should (= (save-excursion
+                (python-tests-look-at "def wwrap(f):")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "return wwrap")
+                (line-beginning-position))))
+   (should (= (save-excursion
+                (python-tests-look-at "def wrapped_f(*args):")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "return wrapped_f")
+                (line-beginning-position))))
+   (should (= (save-excursion
+                (python-tests-look-at "f(*args)")
+                (python-nav-end-of-defun)
+                (point))
+              (save-excursion
+                (python-tests-look-at "return wrapped_f")
+                (line-beginning-position))))))
+
+
+(ert-deftest python-nav-beginning-of-statement-1 ()
+  (python-tests-with-temp-buffer
+   "
+v1 = 123 + \
+     456 + \
+     789
+v2 = (value1,
+      value2,
+
+      value3,
+      value4)
+v3 = ('this is a string'
+
+      'that is continued'
+      'between lines'
+      'within a paren',
+      # this is a comment, yo
+      'continue previous line')
+v4 = '''
+a very long
+string
+'''
+"
+   (python-tests-look-at "v2 =")
+   (python-util-forward-comment -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-statement)
+                (point))
+              (python-tests-look-at "v1 =" -1 t)))
+   (python-tests-look-at "v3 =")
+   (python-util-forward-comment -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-statement)
+                (point))
+              (python-tests-look-at "v2 =" -1 t)))
+   (python-tests-look-at "v4 =")
+   (python-util-forward-comment -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-statement)
+                (point))
+              (python-tests-look-at "v3 =" -1 t)))
+   (goto-char (point-max))
+   (python-util-forward-comment -1)
+   (should (= (save-excursion
+                (python-nav-beginning-of-statement)
+                (point))
+              (python-tests-look-at "v4 =" -1 t)))))
+
+(ert-deftest python-nav-end-of-statement-1 ()
+  (python-tests-with-temp-buffer
+   "
+v1 = 123 + \
+     456 + \
+     789
+v2 = (value1,
+      value2,
+
+      value3,
+      value4)
+v3 = ('this is a string'
+
+      'that is continued'
+      'between lines'
+      'within a paren',
+      # this is a comment, yo
+      'continue previous line')
+v4 = '''
+a very long
+string
+'''
+"
+   (python-tests-look-at "v1 =")
+   (should (= (save-excursion
+                (python-nav-end-of-statement)
+                (point))
+              (save-excursion
+                (python-tests-look-at "789")
+                (line-end-position))))
+   (python-tests-look-at "v2 =")
+   (should (= (save-excursion
+                (python-nav-end-of-statement)
+                (point))
+              (save-excursion
+                (python-tests-look-at "value4)")
+                (line-end-position))))
+   (python-tests-look-at "v3 =")
+   (should (= (save-excursion
+                (python-nav-end-of-statement)
+                (point))
+              (save-excursion
+                (python-tests-look-at
+                 "'continue previous line')")
+                (line-end-position))))
+   (python-tests-look-at "v4 =")
+   (should (= (save-excursion
+                (python-nav-end-of-statement)
+                (point))
+              (save-excursion
+                (goto-char (point-max))
+                (python-util-forward-comment -1)
+                (point))))))
+
+(ert-deftest python-nav-forward-statement-1 ()
+  (python-tests-with-temp-buffer
+   "
+v1 = 123 + \
+     456 + \
+     789
+v2 = (value1,
+      value2,
+
+      value3,
+      value4)
+v3 = ('this is a string'
+
+      'that is continued'
+      'between lines'
+      'within a paren',
+      # this is a comment, yo
+      'continue previous line')
+v4 = '''
+a very long
+string
+'''
+"
+   (python-tests-look-at "v1 =")
+   (should (= (save-excursion
+                (python-nav-forward-statement)
+                (point))
+              (python-tests-look-at "v2 =")))
+   (should (= (save-excursion
+                (python-nav-forward-statement)
+                (point))
+              (python-tests-look-at "v3 =")))
+   (should (= (save-excursion
+                (python-nav-forward-statement)
+                (point))
+              (python-tests-look-at "v4 =")))
+   (should (= (save-excursion
+                (python-nav-forward-statement)
+                (point))
+              (point-max)))))
+
+(ert-deftest python-nav-backward-statement-1 ()
+  (python-tests-with-temp-buffer
+   "
+v1 = 123 + \
+     456 + \
+     789
+v2 = (value1,
+      value2,
+
+      value3,
+      value4)
+v3 = ('this is a string'
+
+      'that is continued'
+      'between lines'
+      'within a paren',
+      # this is a comment, yo
+      'continue previous line')
+v4 = '''
+a very long
+string
+'''
+"
+   (goto-char (point-max))
+   (should (= (save-excursion
+                (python-nav-backward-statement)
+                (point))
+              (python-tests-look-at "v4 =" -1)))
+   (should (= (save-excursion
+                (python-nav-backward-statement)
+                (point))
+              (python-tests-look-at "v3 =" -1)))
+   (should (= (save-excursion
+                (python-nav-backward-statement)
+                (point))
+              (python-tests-look-at "v2 =" -1)))
+   (should (= (save-excursion
+                (python-nav-backward-statement)
+                (point))
+              (python-tests-look-at "v1 =" -1)))))
+
+(ert-deftest python-nav-backward-statement-2 ()
+  :expected-result :failed
+  (python-tests-with-temp-buffer
+   "
+v1 = 123 + \
+     456 + \
+     789
+v2 = (value1,
+      value2,
+
+      value3,
+      value4)
+"
+   ;; FIXME: For some reason `python-nav-backward-statement' is moving
+   ;; back two sentences when starting from 'value4)'.
+   (goto-char (point-max))
+   (python-util-forward-comment -1)
+   (should (= (save-excursion
+                (python-nav-backward-statement)
+                (point))
+              (python-tests-look-at "v2 =" -1 t)))))
+
+(ert-deftest python-nav-beginning-of-block-1 ()
+  (python-tests-with-temp-buffer
+   "
+def decoratorFunctionWithArguments(arg1, arg2, arg3):
+    '''print decorated function call data to stdout.
+
+    Usage:
+
+    @decoratorFunctionWithArguments('arg1', 'arg2')
+    def func(a, b, c=True):
+        pass
+    '''
+
+    def wwrap(f):
+        print 'Inside wwrap()'
+        def wrapped_f(*args):
+            print 'Inside wrapped_f()'
+            print 'Decorator arguments:', arg1, arg2, arg3
+            f(*args)
+            print 'After f(*args)'
+        return wrapped_f
+    return wwrap
+"
+   (python-tests-look-at "return wwrap")
+   (should (= (save-excursion
+                (python-nav-beginning-of-block)
+                (point))
+              (python-tests-look-at "def decoratorFunctionWithArguments" -1)))
+   (python-tests-look-at "print 'Inside wwrap()'")
+   (should (= (save-excursion
+                (python-nav-beginning-of-block)
+                (point))
+              (python-tests-look-at "def wwrap(f):" -1)))
+   (python-tests-look-at "print 'After f(*args)'")
+   (end-of-line)
+   (should (= (save-excursion
+                (python-nav-beginning-of-block)
+                (point))
+              (python-tests-look-at "def wrapped_f(*args):" -1)))
+   (python-tests-look-at "return wrapped_f")
+   (should (= (save-excursion
+                (python-nav-beginning-of-block)
+                (point))
+              (python-tests-look-at "def wwrap(f):" -1)))))
+
+(ert-deftest python-nav-end-of-block-1 ()
+  (python-tests-with-temp-buffer
+   "
+def decoratorFunctionWithArguments(arg1, arg2, arg3):
+    '''print decorated function call data to stdout.
+
+    Usage:
+
+    @decoratorFunctionWithArguments('arg1', 'arg2')
+    def func(a, b, c=True):
+        pass
+    '''
+
+    def wwrap(f):
+        print 'Inside wwrap()'
+        def wrapped_f(*args):
+            print 'Inside wrapped_f()'
+            print 'Decorator arguments:', arg1, arg2, arg3
+            f(*args)
+            print 'After f(*args)'
+        return wrapped_f
+    return wwrap
+"
+   (python-tests-look-at "def decoratorFunctionWithArguments")
+   (should (= (save-excursion
+                (python-nav-end-of-block)
+                (point))
+              (save-excursion
+                (goto-char (point-max))
+                (python-util-forward-comment -1)
+                (point))))
+   (python-tests-look-at "def wwrap(f):")
+   (should (= (save-excursion
+                (python-nav-end-of-block)
+                (point))
+              (save-excursion
+                (python-tests-look-at "return wrapped_f")
+                (line-end-position))))
+   (end-of-line)
+   (should (= (save-excursion
+                (python-nav-end-of-block)
+                (point))
+              (save-excursion
+                (python-tests-look-at "return wrapped_f")
+                (line-end-position))))
+   (python-tests-look-at "f(*args)")
+   (should (= (save-excursion
+                (python-nav-end-of-block)
+                (point))
+              (save-excursion
+                (python-tests-look-at "print 'After f(*args)'")
+                (line-end-position))))))
+
+(ert-deftest python-nav-forward-block-1 ()
+  "This also accounts as a test for `python-nav-backward-block'."
+  (python-tests-with-temp-buffer
+   "
+if request.user.is_authenticated():
+    # def block():
+    #     pass
+    try:
+        profile = request.user.get_profile()
+    except Profile.DoesNotExist:
+        profile = Profile.objects.create(user=request.user)
+    else:
+        if profile.stats:
+            profile.recalculate_stats()
+        else:
+            profile.clear_stats()
+    finally:
+        profile.views += 1
+        profile.save()
+"
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "if request.user.is_authenticated():")))
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "try:")))
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "except Profile.DoesNotExist:")))
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "else:")))
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "if profile.stats:")))
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "else:")))
+   (should (= (save-excursion (python-nav-forward-block))
+              (python-tests-look-at "finally:")))
+   ;; When point is at the last block, leave it there and return nil
+   (should (not (save-excursion (python-nav-forward-block))))
+   ;; Move backwards, and even if the number of moves is less than the
+   ;; provided argument return the point.
+   (should (= (save-excursion (python-nav-forward-block -10))
+              (python-tests-look-at
+               "if request.user.is_authenticated():" -1)))))
+
+(ert-deftest python-nav-lisp-forward-sexp-safe-1 ()
+  (python-tests-with-temp-buffer
+   "
+profile = Profile.objects.create(user=request.user)
+profile.notify()
+"
+   (python-tests-look-at "profile =")
+   (python-nav-lisp-forward-sexp-safe 4)
+   (should (looking-at "(user=request.user)"))
+   (python-tests-look-at "user=request.user")
+   (python-nav-lisp-forward-sexp-safe -1)
+   (should (looking-at "(user=request.user)"))
+   (python-nav-lisp-forward-sexp-safe -4)
+   (should (looking-at "profile ="))
+   (python-tests-look-at "user=request.user")
+   (python-nav-lisp-forward-sexp-safe 3)
+   (should (looking-at ")"))
+   (python-nav-lisp-forward-sexp-safe 1)
+   (should (looking-at "$"))
+   (python-nav-lisp-forward-sexp-safe 1)
+   (should (looking-at ".notify()"))))
+
+(ert-deftest python-nav-forward-sexp-1 ()
+  (python-tests-with-temp-buffer
+   "
+a()
+b()
+c()
+"
+   (python-tests-look-at "a()")
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (beginning-of-line)
+             (looking-at "a()")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (beginning-of-line)
+             (looking-at "b()")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (beginning-of-line)
+             (looking-at "c()")))
+   ;; Movement next to a paren should do what lisp does and
+   ;; unfortunately It can't change, because otherwise
+   ;; `blink-matching-open' breaks.
+   (python-nav-forward-sexp -1)
+   (should (looking-at "()"))
+   (should (save-excursion
+             (beginning-of-line)
+             (looking-at "c()")))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "c()"))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "b()"))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "a()"))))
+
+(ert-deftest python-nav-forward-sexp-2 ()
+  (python-tests-with-temp-buffer
+   "
+def func():
+    if True:
+        aaa = bbb
+        ccc = ddd
+        eee = fff
+    return ggg
+"
+   (python-tests-look-at "aa =")
+   (python-nav-forward-sexp)
+   (should (looking-at " = bbb"))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (back-to-indentation)
+             (looking-at "aaa = bbb")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (back-to-indentation)
+             (looking-at "ccc = ddd")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (back-to-indentation)
+             (looking-at "eee = fff")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should (save-excursion
+             (back-to-indentation)
+             (looking-at "return ggg")))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "def func():"))))
+
+(ert-deftest python-nav-forward-sexp-3 ()
+  (python-tests-with-temp-buffer
+   "
+from some_module import some_sub_module
+from another_module import another_sub_module
+
+def another_statement():
+    pass
+"
+   (python-tests-look-at "some_module")
+   (python-nav-forward-sexp)
+   (should (looking-at " import"))
+   (python-nav-forward-sexp)
+   (should (looking-at " some_sub_module"))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should
+    (save-excursion
+      (back-to-indentation)
+      (looking-at
+       "from some_module import some_sub_module")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should
+    (save-excursion
+      (back-to-indentation)
+      (looking-at
+       "from another_module import another_sub_module")))
+   (python-nav-forward-sexp)
+   (should (looking-at "$"))
+   (should
+    (save-excursion
+      (back-to-indentation)
+      (looking-at
+       "pass")))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "def another_statement():"))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "from another_module import another_sub_module"))
+   (python-nav-forward-sexp -1)
+   (should (looking-at "from some_module import some_sub_module"))))
+
+(ert-deftest python-nav-up-list-1 ()
+  (python-tests-with-temp-buffer
+   "
+def f():
+    if True:
+        return [i for i in range(3)]
+"
+   (python-tests-look-at "3)]")
+   (python-nav-up-list)
+   (should (looking-at "]"))
+   (python-nav-up-list)
+   (should (looking-at "$"))))
+
+(ert-deftest python-nav-backward-up-list-1 ()
+  :expected-result :failed
+  (python-tests-with-temp-buffer
+   "
+def f():
+    if True:
+        return [i for i in range(3)]
+"
+   (python-tests-look-at "3)]")
+   (python-nav-backward-up-list)
+   (should (looking-at "(3)\\]"))
+   (python-nav-backward-up-list)
+   (should (looking-at
+            "\\[i for i in range(3)\\]"))
+   ;; FIXME: Need to move to beginning-of-statement.
+   (python-nav-backward-up-list)
+   (should (looking-at
+            "return \\[i for i in range(3)\\]"))
+   (python-nav-backward-up-list)
+   (should (looking-at "if True:"))
+   (python-nav-backward-up-list)
+   (should (looking-at "def f():"))))
+
+
+;;; Shell integration
+
+(defvar python-tests-shell-interpreter "python")
+
+(ert-deftest python-shell-get-process-name-1 ()
+  "Check process name calculation on different scenarios."
+  (python-tests-with-temp-buffer
+      ""
+    (should (string= (python-shell-get-process-name nil)
+                     python-shell-buffer-name))
+    ;; When the `current-buffer' doesn't have `buffer-file-name', even
+    ;; if dedicated flag is non-nil should not include its name.
+    (should (string= (python-shell-get-process-name t)
+                     python-shell-buffer-name)))
+  (python-tests-with-temp-file
+      ""
+    ;; `buffer-file-name' is non-nil but the dedicated flag is nil and
+    ;; should be respected.
+    (should (string= (python-shell-get-process-name nil)
+                     python-shell-buffer-name))
+    (should (string=
+             (python-shell-get-process-name t)
+             (format "%s[%s]" python-shell-buffer-name buffer-file-name)))))
+
+(ert-deftest python-shell-internal-get-process-name-1 ()
+  "Check the internal process name is config-unique."
+  (let* ((python-shell-interpreter python-tests-shell-interpreter)
+         (python-shell-interpreter-args "")
+         (python-shell-prompt-regexp ">>> ")
+         (python-shell-prompt-block-regexp "[.][.][.] ")
+         (python-shell-setup-codes "")
+         (python-shell-process-environment "")
+         (python-shell-extra-pythonpaths "")
+         (python-shell-exec-path "")
+         (python-shell-virtualenv-path "")
+         (expected (python-tests-with-temp-buffer
+                       "" (python-shell-internal-get-process-name))))
+    ;; Same configurations should match.
+    (should
+     (string= expected
+              (python-tests-with-temp-buffer
+                  "" (python-shell-internal-get-process-name))))
+    (let ((python-shell-interpreter-args "-B"))
+      ;; A minimal change should generate different names.
+      (should
+       (not (string=
+             expected
+             (python-tests-with-temp-buffer
+                 "" (python-shell-internal-get-process-name))))))))
+
+(ert-deftest python-shell-parse-command-1 ()
+  "Check the command to execute is calculated correctly.
+Using `python-shell-interpreter' and
+`python-shell-interpreter-args'."
+  :expected-result (if (executable-find python-tests-shell-interpreter)
+                       :passed
+                     :failed)
+  (let ((python-shell-interpreter (executable-find
+                                   python-tests-shell-interpreter))
+        (python-shell-interpreter-args "-B"))
+    (should (string=
+             (format "%s %s"
+                     python-shell-interpreter
+                     python-shell-interpreter-args)
+             (python-shell-parse-command)))))
+
+(ert-deftest python-shell-calculate-process-environment-1 ()
+  "Test `python-shell-process-environment' modification."
+  (let* ((original-process-environment process-environment)
+         (python-shell-process-environment
+          '("TESTVAR1=value1" "TESTVAR2=value2"))
+         (process-environment
+          (python-shell-calculate-process-environment)))
+    (should (equal (getenv "TESTVAR1") "value1"))
+    (should (equal (getenv "TESTVAR2") "value2"))))
+
+(ert-deftest python-shell-calculate-process-environment-2 ()
+  "Test `python-shell-extra-pythonpaths' modification."
+  (let* ((original-process-environment process-environment)
+         (original-pythonpath (getenv "PYTHONPATH"))
+         (paths '("path1" "path2"))
+         (python-shell-extra-pythonpaths paths)
+         (process-environment
+          (python-shell-calculate-process-environment)))
+    (should (equal (getenv "PYTHONPATH")
+                   (concat
+                    (mapconcat 'identity paths path-separator)
+                    path-separator original-pythonpath)))))
+
+(ert-deftest python-shell-calculate-process-environment-3 ()
+  "Test `python-shell-virtualenv-path' modification."
+  (let* ((original-process-environment process-environment)
+         (original-path (or (getenv "PATH") ""))
+         (python-shell-virtualenv-path
+          (directory-file-name user-emacs-directory))
+         (process-environment
+          (python-shell-calculate-process-environment)))
+    (should (not (getenv "PYTHONHOME")))
+    (should (string= (getenv "VIRTUAL_ENV") python-shell-virtualenv-path))
+    (should (equal (getenv "PATH")
+                   (format "%s/bin%s%s"
+                           python-shell-virtualenv-path
+                           path-separator original-path)))))
+
+(ert-deftest python-shell-calculate-exec-path-1 ()
+  "Test `python-shell-exec-path' modification."
+  (let* ((original-exec-path exec-path)
+         (python-shell-exec-path '("path1" "path2"))
+         (exec-path (python-shell-calculate-exec-path)))
+    (should (equal
+             exec-path
+             (append python-shell-exec-path
+                     original-exec-path)))))
+
+(ert-deftest python-shell-calculate-exec-path-2 ()
+  "Test `python-shell-exec-path' modification."
+  (let* ((original-exec-path exec-path)
+         (python-shell-virtualenv-path
+          (directory-file-name user-emacs-directory))
+         (exec-path (python-shell-calculate-exec-path)))
+    (should (equal
+             exec-path
+             (append (cons
+                      (format "%s/bin" python-shell-virtualenv-path)
+                      original-exec-path))))))
+
+(ert-deftest python-shell-make-comint-1 ()
+  "Check comint creation for global shell buffer."
+  :expected-result (if (executable-find python-tests-shell-interpreter)
+                       :passed
+                     :failed)
+  (let* ((python-shell-interpreter
+          (executable-find python-tests-shell-interpreter))
+         (proc-name (python-shell-get-process-name nil))
+         (shell-buffer
+          (python-tests-with-temp-buffer
+              "" (python-shell-make-comint
+                  (python-shell-parse-command) proc-name)))
+         (process (get-buffer-process shell-buffer)))
+    (unwind-protect
+        (progn
+          (set-process-query-on-exit-flag process nil)
+          (should (process-live-p process))
+          (with-current-buffer shell-buffer
+            (should (eq major-mode 'inferior-python-mode))
+            (should (string= (buffer-name) (format "*%s*" proc-name)))))
+      (kill-buffer shell-buffer))))
+
+(ert-deftest python-shell-make-comint-2 ()
+  "Check comint creation for internal shell buffer."
+  :expected-result (if (executable-find python-tests-shell-interpreter)
+                       :passed
+                     :failed)
+  (let* ((python-shell-interpreter
+          (executable-find python-tests-shell-interpreter))
+         (proc-name (python-shell-internal-get-process-name))
+         (shell-buffer
+          (python-tests-with-temp-buffer
+              "" (python-shell-make-comint
+                  (python-shell-parse-command) proc-name nil t)))
+         (process (get-buffer-process shell-buffer)))
+    (unwind-protect
+        (progn
+          (set-process-query-on-exit-flag process nil)
+          (should (process-live-p process))
+          (with-current-buffer shell-buffer
+            (should (eq major-mode 'inferior-python-mode))
+            (should (string= (buffer-name) (format " *%s*" proc-name)))))
+      (kill-buffer shell-buffer))))
+
+(ert-deftest python-shell-get-process-1 ()
+  "Check dedicated shell process preference over global."
+  :expected-result (if (executable-find python-tests-shell-interpreter)
+                       :passed
+                     :failed)
+  (python-tests-with-temp-file
+      ""
+    (let* ((python-shell-interpreter
+            (executable-find python-tests-shell-interpreter))
+           (global-proc-name (python-shell-get-process-name nil))
+           (dedicated-proc-name (python-shell-get-process-name t))
+           (global-shell-buffer
+            (python-shell-make-comint
+             (python-shell-parse-command) global-proc-name))
+           (dedicated-shell-buffer
+            (python-shell-make-comint
+             (python-shell-parse-command) dedicated-proc-name))
+           (global-process (get-buffer-process global-shell-buffer))
+           (dedicated-process (get-buffer-process dedicated-shell-buffer)))
+      (unwind-protect
+          (progn
+            (set-process-query-on-exit-flag global-process nil)
+            (set-process-query-on-exit-flag dedicated-process nil)
+            ;; Prefer dedicated if global also exists.
+            (should (equal (python-shell-get-process) dedicated-process))
+            (kill-buffer dedicated-shell-buffer)
+            ;; If there's only global, use it.
+            (should (equal (python-shell-get-process) global-process))
+            (kill-buffer global-shell-buffer)
+            ;; No buffer available.
+            (should (not (python-shell-get-process))))
+        (ignore-errors (kill-buffer global-shell-buffer))
+        (ignore-errors (kill-buffer dedicated-shell-buffer))))))
+
+(ert-deftest python-shell-get-or-create-process-1 ()
+  "Check shell process creation fallback."
+  :expected-result :failed
+  (python-tests-with-temp-file
+      ""
+    ;; XXX: Break early until we can skip stuff.  We need to mimic
+    ;; user interaction because `python-shell-get-or-create-process'
+    ;; asks for all arguments interactively when a shell process
+    ;; doesn't exist.
+    (should nil)
+    (let* ((python-shell-interpreter
+            (executable-find python-tests-shell-interpreter))
+           (use-dialog-box)
+           (dedicated-process-name (python-shell-get-process-name t))
+           (dedicated-process (python-shell-get-or-create-process))
+           (dedicated-shell-buffer (process-buffer dedicated-process)))
+      (unwind-protect
+          (progn
+            (set-process-query-on-exit-flag dedicated-process nil)
+            ;; Prefer dedicated if not buffer exist.
+            (should (equal (process-name dedicated-process)
+                           dedicated-process-name))
+            (kill-buffer dedicated-shell-buffer)
+            ;; No buffer available.
+            (should (not (python-shell-get-process))))
+        (ignore-errors (kill-buffer dedicated-shell-buffer))))))
+
+(ert-deftest python-shell-internal-get-or-create-process-1 ()
+  "Check internal shell process creation fallback."
+  :expected-result (if (executable-find python-tests-shell-interpreter)
+                       :passed
+                     :failed)
+  (python-tests-with-temp-file
+      ""
+    (should (not (process-live-p (python-shell-internal-get-process-name))))
+    (let* ((python-shell-interpreter
+            (executable-find python-tests-shell-interpreter))
+           (internal-process-name (python-shell-internal-get-process-name))
+           (internal-process (python-shell-internal-get-or-create-process))
+           (internal-shell-buffer (process-buffer internal-process)))
+      (unwind-protect
+          (progn
+            (set-process-query-on-exit-flag internal-process nil)
+            (should (equal (process-name internal-process)
+                           internal-process-name))
+            (should (equal internal-process
+                           (python-shell-internal-get-or-create-process)))
+            ;; No user buffer available.
+            (should (not (python-shell-get-process)))
+            (kill-buffer internal-shell-buffer))
+        (ignore-errors (kill-buffer internal-shell-buffer))))))
+
+
+;;; Shell completion
+
+
+;;; PDB Track integration
+
+
+;;; Symbol completion
+
+
+;;; Fill paragraph
+
+
+;;; Skeletons
+
+
+;;; FFAP
+
+
+;;; Code check
+
+
+;;; Eldoc
+
+
+;;; Imenu
+(ert-deftest python-imenu-prev-index-position-1 ()
+  (require 'imenu)
+  (python-tests-with-temp-buffer
+   "
+def decoratorFunctionWithArguments(arg1, arg2, arg3):
+    '''print decorated function call data to stdout.
+
+    Usage:
+
+    @decoratorFunctionWithArguments('arg1', 'arg2')
+    def func(a, b, c=True):
+        pass
+    '''
+
+    def wwrap(f):
+        print 'Inside wwrap()'
+        def wrapped_f(*args):
+            print 'Inside wrapped_f()'
+            print 'Decorator arguments:', arg1, arg2, arg3
+            f(*args)
+            print 'After f(*args)'
+        return wrapped_f
+    return wwrap
+
+def test(): # Some comment
+    'This is a test function'
+    print 'test'
+
+class C(object):
+
+    def m(self):
+        self.c()
+
+        def b():
+            pass
+
+        def a():
+            pass
+
+    def c(self):
+        pass
+"
+   (let ((expected
+          '(("*Rescan*" . -99)
+            ("decoratorFunctionWithArguments" . 2)
+            ("decoratorFunctionWithArguments.wwrap" . 224)
+            ("decoratorFunctionWithArguments.wwrap.wrapped_f" . 273)
+            ("test" . 500)
+            ("C" . 575)
+            ("C.m" . 593)
+            ("C.m.b" . 628)
+            ("C.m.a" . 663)
+            ("C.c" . 698))))
+     (mapc
+      (lambda (elt)
+        (should (= (cdr (assoc-string (car elt) expected))
+                   (if (markerp (cdr elt))
+                       (marker-position (cdr elt))
+                     (cdr elt)))))
+      (imenu--make-index-alist)))))
+
+
+;;; Misc helpers
+
+(ert-deftest python-info-current-defun-1 ()
+  (python-tests-with-temp-buffer
+   "
+def foo(a, b):
+"
+   (forward-line 1)
+   (should (string= "foo" (python-info-current-defun)))
+   (should (string= "def foo" (python-info-current-defun t)))
+   (forward-line 1)
+   (should (not (python-info-current-defun)))
+   (indent-for-tab-command)
+   (should (string= "foo" (python-info-current-defun)))
+   (should (string= "def foo" (python-info-current-defun t)))))
+
+(ert-deftest python-info-current-defun-2 ()
+  (python-tests-with-temp-buffer
+   "
+class C(object):
+
+    def m(self):
+        if True:
+            return [i for i in range(3)]
+        else:
+            return []
+
+        def b():
+            pass
+
+        def a():
+            pass
+
+    def c(self):
+        pass
+"
+   (forward-line 1)
+   (should (string= "C" (python-info-current-defun)))
+   (should (string= "class C" (python-info-current-defun t)))
+   (python-tests-look-at "return [i for ")
+   (should (string= "C.m" (python-info-current-defun)))
+   (should (string= "def C.m" (python-info-current-defun t)))
+   (python-tests-look-at "def b():")
+   (should (string= "C.m.b" (python-info-current-defun)))
+   (should (string= "def C.m.b" (python-info-current-defun t)))
+   (forward-line 2)
+   (indent-for-tab-command)
+   (python-indent-dedent-line-backspace 1)
+   (should (string= "C.m" (python-info-current-defun)))
+   (should (string= "def C.m" (python-info-current-defun t)))
+   (python-tests-look-at "def c(self):")
+   (forward-line -1)
+   (indent-for-tab-command)
+   (should (string= "C.m.a" (python-info-current-defun)))
+   (should (string= "def C.m.a" (python-info-current-defun t)))
+   (python-indent-dedent-line-backspace 1)
+   (should (string= "C.m" (python-info-current-defun)))
+   (should (string= "def C.m" (python-info-current-defun t)))
+   (python-indent-dedent-line-backspace 1)
+   (should (string= "C" (python-info-current-defun)))
+   (should (string= "class C" (python-info-current-defun t)))
+   (python-tests-look-at "def c(self):")
+   (should (string= "C.c" (python-info-current-defun)))
+   (should (string= "def C.c" (python-info-current-defun t)))
+   (python-tests-look-at "pass")
+   (should (string= "C.c" (python-info-current-defun)))
+   (should (string= "def C.c" (python-info-current-defun t)))))
+
+(ert-deftest python-info-current-defun-3 ()
+  (python-tests-with-temp-buffer
+   "
+def decoratorFunctionWithArguments(arg1, arg2, arg3):
+    '''print decorated function call data to stdout.
+
+    Usage:
+
+    @decoratorFunctionWithArguments('arg1', 'arg2')
+    def func(a, b, c=True):
+        pass
+    '''
+
+    def wwrap(f):
+        print 'Inside wwrap()'
+        def wrapped_f(*args):
+            print 'Inside wrapped_f()'
+            print 'Decorator arguments:', arg1, arg2, arg3
+            f(*args)
+            print 'After f(*args)'
+        return wrapped_f
+    return wwrap
+"
+   (python-tests-look-at "def wwrap(f):")
+   (forward-line -1)
+   (should (not (python-info-current-defun)))
+   (indent-for-tab-command 1)
+   (should (string= (python-info-current-defun)
+                    "decoratorFunctionWithArguments"))
+   (should (string= (python-info-current-defun t)
+                    "def decoratorFunctionWithArguments"))
+   (python-tests-look-at "def wrapped_f(*args):")
+   (should (string= (python-info-current-defun)
+                    "decoratorFunctionWithArguments.wwrap.wrapped_f"))
+   (should (string= (python-info-current-defun t)
+                    "def decoratorFunctionWithArguments.wwrap.wrapped_f"))
+   (python-tests-look-at "return wrapped_f")
+   (should (string= (python-info-current-defun)
+                    "decoratorFunctionWithArguments.wwrap"))
+   (should (string= (python-info-current-defun t)
+                    "def decoratorFunctionWithArguments.wwrap"))
+   (end-of-line 1)
+   (python-tests-look-at "return wwrap")
+   (should (string= (python-info-current-defun)
+                    "decoratorFunctionWithArguments"))
+   (should (string= (python-info-current-defun t)
+                    "def decoratorFunctionWithArguments"))))
+
+(ert-deftest python-info-current-symbol-1 ()
+  (python-tests-with-temp-buffer
+   "
+class C(object):
+
+    def m(self):
+        self.c()
+
+    def c(self):
+        print ('a')
+"
+   (python-tests-look-at "self.c()")
+   (should (string= "self.c" (python-info-current-symbol)))
+   (should (string= "C.c" (python-info-current-symbol t)))))
+
+(ert-deftest python-info-current-symbol-2 ()
+  (python-tests-with-temp-buffer
+   "
+class C(object):
+
+    class M(object):
+
+        def a(self):
+            self.c()
+
+        def c(self):
+            pass
+"
+   (python-tests-look-at "self.c()")
+   (should (string= "self.c" (python-info-current-symbol)))
+   (should (string= "C.M.c" (python-info-current-symbol t)))))
+
+(ert-deftest python-info-current-symbol-3 ()
+  "Keywords should not be considered symbols."
+  :expected-result :failed
+  (python-tests-with-temp-buffer
+   "
+class C(object):
+    pass
+"
+   ;; FIXME: keywords are not symbols.
+   (python-tests-look-at "class C")
+   (should (not (python-info-current-symbol)))
+   (should (not (python-info-current-symbol t)))
+   (python-tests-look-at "C(object)")
+   (should (string= "C" (python-info-current-symbol)))
+   (should (string= "class C" (python-info-current-symbol t)))))
+
+(ert-deftest python-info-statement-starts-block-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (python-tests-look-at "def long_function_name")
+   (should (python-info-statement-starts-block-p))
+   (python-tests-look-at "print (var_one)")
+   (python-util-forward-comment -1)
+   (should (python-info-statement-starts-block-p))))
+
+(ert-deftest python-info-statement-starts-block-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError('sorry, you lose')
+"
+   (python-tests-look-at "if width == 0 and")
+   (should (python-info-statement-starts-block-p))
+   (python-tests-look-at "raise ValueError(")
+   (python-util-forward-comment -1)
+   (should (python-info-statement-starts-block-p))))
+
+(ert-deftest python-info-statement-ends-block-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (python-tests-look-at "print (var_one)")
+   (should (python-info-statement-ends-block-p))))
+
+(ert-deftest python-info-statement-ends-block-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "raise ValueError(")
+   (should (python-info-statement-ends-block-p))))
+
+(ert-deftest python-info-beginning-of-statement-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (python-tests-look-at "def long_function_name")
+   (should (python-info-beginning-of-statement-p))
+   (forward-char 10)
+   (should (not (python-info-beginning-of-statement-p)))
+   (python-tests-look-at "print (var_one)")
+   (should (python-info-beginning-of-statement-p))
+   (goto-char (line-beginning-position))
+   (should (not (python-info-beginning-of-statement-p)))))
+
+(ert-deftest python-info-beginning-of-statement-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "if width == 0 and")
+   (should (python-info-beginning-of-statement-p))
+   (forward-char 10)
+   (should (not (python-info-beginning-of-statement-p)))
+   (python-tests-look-at "raise ValueError(")
+   (should (python-info-beginning-of-statement-p))
+   (goto-char (line-beginning-position))
+   (should (not (python-info-beginning-of-statement-p)))))
+
+(ert-deftest python-info-end-of-statement-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (python-tests-look-at "def long_function_name")
+   (should (not (python-info-end-of-statement-p)))
+   (end-of-line)
+   (should (not (python-info-end-of-statement-p)))
+   (python-tests-look-at "print (var_one)")
+   (python-util-forward-comment -1)
+   (should (python-info-end-of-statement-p))
+   (python-tests-look-at "print (var_one)")
+   (should (not (python-info-end-of-statement-p)))
+   (end-of-line)
+   (should (python-info-end-of-statement-p))))
+
+(ert-deftest python-info-end-of-statement-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "if width == 0 and")
+   (should (not (python-info-end-of-statement-p)))
+   (end-of-line)
+   (should (not (python-info-end-of-statement-p)))
+   (python-tests-look-at "raise ValueError(")
+   (python-util-forward-comment -1)
+   (should (python-info-end-of-statement-p))
+   (python-tests-look-at "raise ValueError(")
+   (should (not (python-info-end-of-statement-p)))
+   (end-of-line)
+   (should (not (python-info-end-of-statement-p)))
+   (goto-char (point-max))
+   (python-util-forward-comment -1)
+   (should (python-info-end-of-statement-p))))
+
+(ert-deftest python-info-beginning-of-block-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (python-tests-look-at "def long_function_name")
+   (should (python-info-beginning-of-block-p))
+   (python-tests-look-at "var_one, var_two, var_three,")
+   (should (not (python-info-beginning-of-block-p)))
+   (python-tests-look-at "print (var_one)")
+   (should (not (python-info-beginning-of-block-p)))))
+
+(ert-deftest python-info-beginning-of-block-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "if width == 0 and")
+   (should (python-info-beginning-of-block-p))
+   (python-tests-look-at "color == 'red' and emphasis")
+   (should (not (python-info-beginning-of-block-p)))
+   (python-tests-look-at "raise ValueError(")
+   (should (not (python-info-beginning-of-block-p)))))
+
+(ert-deftest python-info-end-of-block-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    print (var_one)
+"
+   (python-tests-look-at "def long_function_name")
+   (should (not (python-info-end-of-block-p)))
+   (python-tests-look-at "var_one, var_two, var_three,")
+   (should (not (python-info-end-of-block-p)))
+   (python-tests-look-at "var_four):")
+   (end-of-line)
+   (should (not (python-info-end-of-block-p)))
+   (python-tests-look-at "print (var_one)")
+   (should (not (python-info-end-of-block-p)))
+   (end-of-line 1)
+   (should (python-info-end-of-block-p))))
+
+(ert-deftest python-info-end-of-block-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "if width == 0 and")
+   (should (not (python-info-end-of-block-p)))
+   (python-tests-look-at "color == 'red' and emphasis == 'strong' or")
+   (should (not (python-info-end-of-block-p)))
+   (python-tests-look-at "highlight > 100:")
+   (end-of-line)
+   (should (not (python-info-end-of-block-p)))
+   (python-tests-look-at "raise ValueError(")
+   (should (not (python-info-end-of-block-p)))
+   (end-of-line 1)
+   (should (not (python-info-end-of-block-p)))
+   (goto-char (point-max))
+   (python-util-forward-comment -1)
+   (should (python-info-end-of-block-p))))
+
+(ert-deftest python-info-closing-block-1 ()
+  (python-tests-with-temp-buffer
+   "
+if request.user.is_authenticated():
+    try:
+        profile = request.user.get_profile()
+    except Profile.DoesNotExist:
+        profile = Profile.objects.create(user=request.user)
+    else:
+        if profile.stats:
+            profile.recalculate_stats()
+        else:
+            profile.clear_stats()
+    finally:
+        profile.views += 1
+        profile.save()
+"
+   (python-tests-look-at "try:")
+   (should (not (python-info-closing-block)))
+   (python-tests-look-at "except Profile.DoesNotExist:")
+   (should (= (python-tests-look-at "try:" -1 t)
+              (python-info-closing-block)))
+   (python-tests-look-at "else:")
+   (should (= (python-tests-look-at "except Profile.DoesNotExist:" -1 t)
+              (python-info-closing-block)))
+   (python-tests-look-at "if profile.stats:")
+   (should (not (python-info-closing-block)))
+   (python-tests-look-at "else:")
+   (should (= (python-tests-look-at "if profile.stats:" -1 t)
+              (python-info-closing-block)))
+   (python-tests-look-at "finally:")
+   (should (= (python-tests-look-at "else:" -2 t)
+              (python-info-closing-block)))))
+
+(ert-deftest python-info-closing-block-2 ()
+  (python-tests-with-temp-buffer
+   "
+if request.user.is_authenticated():
+    profile = Profile.objects.get_or_create(user=request.user)
+    if profile.stats:
+        profile.recalculate_stats()
+
+data = {
+    'else': 'do it'
+}
+    'else'
+"
+   (python-tests-look-at "'else': 'do it'")
+   (should (not (python-info-closing-block)))
+   (python-tests-look-at "'else'")
+   (should (not (python-info-closing-block)))))
+
+(ert-deftest python-info-line-ends-backslash-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+objects = Thing.objects.all() \\\\
+                       .filter(
+                           type='toy',
+                           status='bought'
+                       ) \\\\
+                       .aggregate(
+                           Sum('amount')
+                       ) \\\\
+                       .values_list()
+"
+   (should (python-info-line-ends-backslash-p 2)) ; .filter(...
+   (should (python-info-line-ends-backslash-p 3))
+   (should (python-info-line-ends-backslash-p 4))
+   (should (python-info-line-ends-backslash-p 5))
+   (should (python-info-line-ends-backslash-p 6)) ; ) \...
+   (should (python-info-line-ends-backslash-p 7))
+   (should (python-info-line-ends-backslash-p 8))
+   (should (python-info-line-ends-backslash-p 9))
+   (should (not (python-info-line-ends-backslash-p 10))))) ; .values_list()...
+
+(ert-deftest python-info-beginning-of-backslash-1 ()
+  (python-tests-with-temp-buffer
+   "
+objects = Thing.objects.all() \\\\
+                       .filter(
+                           type='toy',
+                           status='bought'
+                       ) \\\\
+                       .aggregate(
+                           Sum('amount')
+                       ) \\\\
+                       .values_list()
+"
+   (let ((first 2)
+         (second (python-tests-look-at ".filter("))
+         (third (python-tests-look-at ".aggregate(")))
+     (should (= first (python-info-beginning-of-backslash 2)))
+     (should (= second (python-info-beginning-of-backslash 3)))
+     (should (= second (python-info-beginning-of-backslash 4)))
+     (should (= second (python-info-beginning-of-backslash 5)))
+     (should (= second (python-info-beginning-of-backslash 6)))
+     (should (= third (python-info-beginning-of-backslash 7)))
+     (should (= third (python-info-beginning-of-backslash 8)))
+     (should (= third (python-info-beginning-of-backslash 9)))
+     (should (not (python-info-beginning-of-backslash 10))))))
+
+(ert-deftest python-info-continuation-line-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "if width == 0 and height == 0 and")
+   (should (not (python-info-continuation-line-p)))
+   (python-tests-look-at "color == 'red' and emphasis == 'strong' or")
+   (should (python-info-continuation-line-p))
+   (python-tests-look-at "highlight > 100:")
+   (should (python-info-continuation-line-p))
+   (python-tests-look-at "raise ValueError(")
+   (should (not (python-info-continuation-line-p)))
+   (python-tests-look-at "'sorry, you lose'")
+   (should (python-info-continuation-line-p))
+   (forward-line 1)
+   (should (python-info-continuation-line-p))
+   (python-tests-look-at ")")
+   (should (python-info-continuation-line-p))
+   (forward-line 1)
+   (should (not (python-info-continuation-line-p)))))
+
+(ert-deftest python-info-block-continuation-line-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+if width == 0 and height == 0 and \\\\
+   color == 'red' and emphasis == 'strong' or \\\\
+   highlight > 100:
+    raise ValueError(
+'sorry, you lose'
+
+)
+"
+   (python-tests-look-at "if width == 0 and")
+   (should (not (python-info-block-continuation-line-p)))
+   (python-tests-look-at "color == 'red' and emphasis == 'strong' or")
+   (should (= (python-info-block-continuation-line-p)
+              (python-tests-look-at "if width == 0 and" -1 t)))
+   (python-tests-look-at "highlight > 100:")
+   (should (not (python-info-block-continuation-line-p)))))
+
+(ert-deftest python-info-block-continuation-line-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+def foo(a,
+        b,
+        c):
+    pass
+"
+   (python-tests-look-at "def foo(a,")
+   (should (not (python-info-block-continuation-line-p)))
+   (python-tests-look-at "b,")
+   (should (= (python-info-block-continuation-line-p)
+              (python-tests-look-at "def foo(a," -1 t)))
+   (python-tests-look-at "c):")
+   (should (not (python-info-block-continuation-line-p)))))
+
+(ert-deftest python-info-assignment-continuation-line-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+data = foo(), bar() \\\\
+       baz(), 4 \\\\
+       5, 6
+"
+   (python-tests-look-at "data = foo(), bar()")
+   (should (not (python-info-assignment-continuation-line-p)))
+   (python-tests-look-at "baz(), 4")
+   (should (= (python-info-assignment-continuation-line-p)
+              (python-tests-look-at "foo()," -1 t)))
+   (python-tests-look-at "5, 6")
+   (should (not (python-info-assignment-continuation-line-p)))))
+
+(ert-deftest python-info-assignment-continuation-line-p-2 ()
+  (python-tests-with-temp-buffer
+   "
+data = (foo(), bar()
+        baz(), 4
+        5, 6)
+"
+   (python-tests-look-at "data = (foo(), bar()")
+   (should (not (python-info-assignment-continuation-line-p)))
+   (python-tests-look-at "baz(), 4")
+   (should (= (python-info-assignment-continuation-line-p)
+              (python-tests-look-at "(foo()," -1 t)))
+   (python-tests-look-at "5, 6)")
+   (should (not (python-info-assignment-continuation-line-p)))))
+
+(ert-deftest python-info-looking-at-beginning-of-defun-1 ()
+  (python-tests-with-temp-buffer
+   "
+def decorat0r(deff):
+    '''decorates stuff.
+
+    @decorat0r
+    def foo(arg):
+        ...
+    '''
+    def wrap():
+        deff()
+    return wwrap
+"
+   (python-tests-look-at "def decorat0r(deff):")
+   (should (python-info-looking-at-beginning-of-defun))
+   (python-tests-look-at "def foo(arg):")
+   (should (not (python-info-looking-at-beginning-of-defun)))
+   (python-tests-look-at "def wrap():")
+   (should (python-info-looking-at-beginning-of-defun))
+   (python-tests-look-at "deff()")
+   (should (not (python-info-looking-at-beginning-of-defun)))))
+
+(ert-deftest python-info-current-line-comment-p-1 ()
+  (python-tests-with-temp-buffer
+   "
+# this is a comment
+foo = True  # another comment
+'#this is a string'
+if foo:
+    # more comments
+    print ('bar') # print bar
+"
+   (python-tests-look-at "# this is a comment")
+   (should (python-info-current-line-comment-p))
+   (python-tests-look-at "foo = True  # another comment")
+   (should (not (python-info-current-line-comment-p)))
+   (python-tests-look-at "'#this is a string'")
+   (should (not (python-info-current-line-comment-p)))
+   (python-tests-look-at "# more comments")
+   (should (python-info-current-line-comment-p))
+   (python-tests-look-at "print ('bar') # print bar")
+   (should (not (python-info-current-line-comment-p)))))
+
+(ert-deftest python-info-current-line-empty-p ()
+  (python-tests-with-temp-buffer
+   "
+# this is a comment
+
+foo = True  # another comment
+"
+   (should (python-info-current-line-empty-p))
+   (python-tests-look-at "# this is a comment")
+   (should (not (python-info-current-line-empty-p)))
+   (forward-line 1)
+   (should (python-info-current-line-empty-p))))
+
+
+;;; Utility functions
+
+(ert-deftest python-util-goto-line-1 ()
+  (python-tests-with-temp-buffer
+   (concat
+    "# a comment
+# another comment
+def foo(a, b, c):
+    pass" (make-string 20 ?\n))
+   (python-util-goto-line 10)
+   (should (= (line-number-at-pos) 10))
+   (python-util-goto-line 20)
+   (should (= (line-number-at-pos) 20))))
+
+(ert-deftest python-util-clone-local-variables-1 ()
+  (let ((buffer (generate-new-buffer
+                 "python-util-clone-local-variables-1"))
+        (varcons
+         '((python-fill-docstring-style . django)
+           (python-shell-interpreter . "python")
+           (python-shell-interpreter-args . "manage.py shell")
+           (python-shell-prompt-regexp . "In \\[[0-9]+\\]: ")
+           (python-shell-prompt-output-regexp . "Out\\[[0-9]+\\]: ")
+           (python-shell-extra-pythonpaths "/home/user/pylib/")
+           (python-shell-completion-setup-code
+            . "from IPython.core.completerlib import module_completion")
+           (python-shell-completion-module-string-code
+            . "';'.join(module_completion('''%s'''))\n")
+           (python-shell-completion-string-code
+            . "';'.join(get_ipython().Completer.all_completions('''%s'''))\n")
+           (python-shell-virtualenv-path
+            . "/home/user/.virtualenvs/project"))))
+    (with-current-buffer buffer
+      (kill-all-local-variables)
+      (dolist (ccons varcons)
+        (set (make-local-variable (car ccons)) (cdr ccons))))
+    (python-tests-with-temp-buffer
+     ""
+     (python-util-clone-local-variables buffer)
+     (dolist (ccons varcons)
+       (should
+        (equal (symbol-value (car ccons)) (cdr ccons)))))
+    (kill-buffer buffer)))
+
+(ert-deftest python-util-forward-comment-1 ()
+  (python-tests-with-temp-buffer
+   (concat
+    "# a comment
+# another comment
+     # bad indented comment
+# more comments" (make-string 9999 ?\n))
+   (python-util-forward-comment 1)
+   (should (= (point) (point-max)))
+   (python-util-forward-comment -1)
+   (should (= (point) (point-min)))))
+
+
+(provide 'python-tests)
+
+;; Local Variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
+;;; python-tests.el ends here
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index ad48413b030..0ebe6d44e34 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -1,6 +1,6 @@
 ;;; ruby-mode-tests.el --- Test suite for ruby-mode
 
-;; Copyright (C) 2012  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -25,9 +25,7 @@
 
 (defun ruby-should-indent (content column)
   "Assert indentation COLUMN on the last line of CONTENT."
-  (with-temp-buffer
-    (insert content)
-    (ruby-mode)
+  (ruby-with-temp-buffer content
     (ruby-indent-line)
     (should (= (current-indentation) column))))
 
@@ -35,33 +33,33 @@
   "Assert that CONTENT turns into EXPECTED after the buffer is re-indented.
 
 The whitespace before and including \"|\" on each line is removed."
-  (with-temp-buffer
-    (insert (ruby-test-string content))
-    (ruby-mode)
+  (ruby-with-temp-buffer (ruby-test-string content)
     (indent-region (point-min) (point-max))
     (should (string= (ruby-test-string expected) (buffer-string)))))
 
+(defmacro ruby-with-temp-buffer (contents &rest body)
+  (declare (indent 1) (debug t))
+  `(with-temp-buffer
+     (insert ,contents)
+     (ruby-mode)
+     ,@body))
+
 (defun ruby-test-string (s &rest args)
   (apply 'format (replace-regexp-in-string "^[ \t]*|" "" s) args))
 
-(defun ruby-assert-state (content &rest values-plist)
+(defun ruby-assert-state (content index value &optional point)
   "Assert syntax state values at the end of CONTENT.
 
 VALUES-PLIST is a list with alternating index and value elements."
-  (with-temp-buffer
-    (insert content)
-    (ruby-mode)
+  (ruby-with-temp-buffer content
+    (when point (goto-char point))
     (syntax-propertize (point))
-    (while values-plist
-      (should (eq (nth (car values-plist)
-                       (parse-partial-sexp (point-min) (point)))
-                  (cadr values-plist)))
-      (setq values-plist (cddr values-plist)))))
+    (should (eq (nth index
+                     (parse-partial-sexp (point-min) (point)))
+                value))))
 
 (defun ruby-assert-face (content pos face)
-  (with-temp-buffer
-    (insert content)
-    (ruby-mode)
+  (ruby-with-temp-buffer content
     (font-lock-fontify-buffer)
     (should (eq face (get-text-property pos 'face)))))
 
@@ -105,6 +103,12 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-should-indent "a = %w[abc\n       def]\n  " 0)
   (ruby-should-indent "a = \"abc\n      def\"\n  " 0))
 
+(ert-deftest ruby-regexp-doesnt-start-in-string ()
+  (ruby-assert-state "'(/', /\d+/" 3 nil))
+
+(ert-deftest ruby-regexp-starts-after-string ()
+  (ruby-assert-state "'(/', /\d+/" 3 ?/ 8))
+
 (ert-deftest ruby-indent-simple ()
   (ruby-should-indent-buffer
    "if foo
@@ -225,18 +229,39 @@ VALUES-PLIST is a list with alternating index and value elements."
    |  end
    |"))
 
+(ert-deftest ruby-indent-after-block-in-continued-expression ()
+  (ruby-should-indent-buffer
+   "var =
+   |  begin
+   |    val
+   |  end
+   |statement"
+   "var =
+   |begin
+   |val
+   |end
+   |statement"))
+
+(ert-deftest ruby-indent-spread-args-in-parens ()
+  (let ((ruby-deep-indent-paren '(?\()))
+    (ruby-should-indent-buffer
+     "foo(1,
+     |    2,
+     |    3)
+     |"
+     "foo(1,
+     | 2,
+     |  3)
+     |")))
+
 (ert-deftest ruby-move-to-block-stops-at-indentation ()
-  (with-temp-buffer
-    (insert "def f\nend")
+  (ruby-with-temp-buffer "def f\nend"
     (beginning-of-line)
-    (ruby-mode)
     (ruby-move-to-block -1)
     (should (looking-at "^def"))))
 
 (ert-deftest ruby-toggle-block-to-do-end ()
-  (with-temp-buffer
-    (insert "foo {|b|\n}")
-    (ruby-mode)
+  (ruby-with-temp-buffer "foo {|b|\n}"
     (beginning-of-line)
     (ruby-toggle-block)
     (should (string= "foo do |b|\nend" (buffer-string)))))
@@ -254,9 +279,7 @@ VALUES-PLIST is a list with alternating index and value elements."
           (should (string= (cdr pair) (buffer-string))))))))
 
 (ert-deftest ruby-toggle-block-to-multiline ()
-  (with-temp-buffer
-    (insert "foo {|b| b + 1}")
-    (ruby-mode)
+  (ruby-with-temp-buffer "foo {|b| b + 1}"
     (beginning-of-line)
     (ruby-toggle-block)
     (should (string= "foo do |b|\n  b + 1\nend" (buffer-string)))))
@@ -276,13 +299,32 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-assert-face "# #{comment}\n \"#{interpolation}\"" 16
                     font-lock-variable-name-face))
 
-(ert-deftest ruby-interpolation-suppresses-syntax-inside ()
+(ert-deftest ruby-interpolation-suppresses-quotes-inside ()
   (let ((s "\"<ul><li>#{@files.join(\"</li><li>\")}</li></ul>\""))
     (ruby-assert-state s 8 nil)
     (ruby-assert-face s 9 font-lock-string-face)
     (ruby-assert-face s 10 font-lock-variable-name-face)
     (ruby-assert-face s 41 font-lock-string-face)))
 
+(ert-deftest ruby-interpolation-suppresses-one-double-quote ()
+  (let ((s "\"foo#{'\"'}\""))
+    (ruby-assert-state s 8 nil)
+    (ruby-assert-face s 8 font-lock-variable-name-face)
+    (ruby-assert-face s 11 font-lock-string-face)))
+
+(ert-deftest ruby-interpolation-suppresses-one-backtick ()
+  (let ((s "`as#{'`'}das`"))
+    (ruby-assert-state s 8 nil)))
+
+(ert-deftest ruby-interpolation-keeps-non-quote-syntax ()
+  (let ((s "\"foo#{baz.tee}bar\""))
+    (ruby-with-temp-buffer s
+      (goto-char (point-min))
+      (ruby-mode)
+      (font-lock-fontify-buffer)
+      (search-forward "tee")
+      (should (string= (thing-at-point 'symbol) "tee")))))
+
 (ert-deftest ruby-interpolation-inside-percent-literal-with-paren ()
   :expected-result :failed
   (let ((s "%(^#{\")\"}^)"))
@@ -296,21 +338,70 @@ VALUES-PLIST is a list with alternating index and value elements."
   (let ((pairs '(("foo" . "#foo")
                  ("C.foo" . ".foo")
                  ("self.foo" . ".foo"))))
-    (loop for (name . value) in pairs
-          do (with-temp-buffer
-               (insert (ruby-test-string
-                        "module M
-                        |  class C
-                        |    def %s
-                        |    end
-                        |  end
-                        |end"
-                        name))
-               (ruby-mode)
-               (search-backward "def")
-               (forward-line)
-               (should (string= (ruby-add-log-current-method)
-                                (format "M::C%s" value)))))))
+    (dolist (pair pairs)
+      (let ((name  (car pair))
+            (value (cdr pair)))
+        (ruby-with-temp-buffer (ruby-test-string
+                                "module M
+                                |  class C
+                                |    def %s
+                                |      _
+                                |    end
+                                |  end
+                                |end"
+                                name)
+          (search-backward "_")
+          (forward-line)
+          (should (string= (ruby-add-log-current-method)
+                           (format "M::C%s" value))))))))
+
+(ert-deftest ruby-add-log-current-method-outside-of-method ()
+  (ruby-with-temp-buffer (ruby-test-string
+                          "module M
+                          |  class C
+                          |    def foo
+                          |    end
+                          |    _
+                          |  end
+                          |end")
+    (search-backward "_")
+    (should (string= (ruby-add-log-current-method)"M::C"))))
+
+(ert-deftest ruby-add-log-current-method-in-singleton-class ()
+  (ruby-with-temp-buffer (ruby-test-string
+                          "class C
+                          |  class << self
+                          |    def foo
+                          |      _
+                          |    end
+                          |  end
+                          |end")
+    (search-backward "_")
+    (should (string= (ruby-add-log-current-method) "C.foo"))))
+
+(ert-deftest ruby-add-log-current-method-namespace-shorthand ()
+  (ruby-with-temp-buffer (ruby-test-string
+                          "class C::D
+                          |  def foo
+                          |    _
+                          |  end
+                          |end")
+    (search-backward "_")
+    (should (string= (ruby-add-log-current-method) "C::D#foo"))))
+
+(ert-deftest ruby-add-log-current-method-after-inner-class ()
+  (ruby-with-temp-buffer (ruby-test-string
+                          "module M
+                          |  class C
+                          |    class D
+                          |    end
+                          |    def foo
+                          |      _
+                          |    end
+                          |  end
+                          |end")
+    (search-backward "_")
+    (should (string= (ruby-add-log-current-method) "M::C#foo"))))
 
 (defvar ruby-block-test-example
   (ruby-test-string
@@ -324,7 +415,8 @@ VALUES-PLIST is a list with alternating index and value elements."
    |  end
    |
    |  def baz
-   |    some do
+   |some do
+   |3
    |    end
    |  end
    |end"))
@@ -341,7 +433,7 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ruby-deftest-move-to-block works-on-do
   (goto-line 11)
   (ruby-end-of-block)
-  (should (= 12 (line-number-at-pos)))
+  (should (= 13 (line-number-at-pos)))
   (ruby-beginning-of-block)
   (should (= 11 (line-number-at-pos))))
 
@@ -353,13 +445,48 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ruby-deftest-move-to-block ok-with-three
   (goto-line 2)
   (ruby-move-to-block 3)
-  (should (= 13 (line-number-at-pos))))
+  (should (= 14 (line-number-at-pos))))
 
 (ruby-deftest-move-to-block ok-with-minus-two
   (goto-line 10)
   (ruby-move-to-block -2)
   (should (= 2 (line-number-at-pos))))
 
+(ert-deftest ruby-move-to-block-skips-percent-literal ()
+  (dolist (s (list (ruby-test-string
+                    "foo do
+                    |  a = %%w(
+                    |    def yaa
+                    |  )
+                    |end")
+                   (ruby-test-string
+                    "foo do
+                    |  a = %%w|
+                    |    end
+                    |  |
+                    |end")))
+    (ruby-with-temp-buffer s
+      (goto-line 1)
+      (ruby-end-of-block)
+      (should (= 5 (line-number-at-pos)))
+      (ruby-beginning-of-block)
+      (should (= 1 (line-number-at-pos))))))
+
+(ert-deftest ruby-move-to-block-skips-heredoc ()
+  (ruby-with-temp-buffer
+      (ruby-test-string
+       "if something_wrong?
+       |  ActiveSupport::Deprecation.warn(<<-eowarn)
+       |  boo hoo
+       |  end
+       |  eowarn
+       |end")
+    (goto-line 1)
+    (ruby-end-of-block)
+    (should (= 6 (line-number-at-pos)))
+    (ruby-beginning-of-block)
+    (should (= 1 (line-number-at-pos)))))
+
 (provide 'ruby-mode-tests)
 
 ;;; ruby-mode-tests.el ends here
diff --git a/test/automated/thingatpt.el b/test/automated/thingatpt.el
new file mode 100644
index 00000000000..f33a8f4b0e6
--- /dev/null
+++ b/test/automated/thingatpt.el
@@ -0,0 +1,88 @@
+;;; thingatpt.el --- tests for thing-at-point.
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(defvar thing-at-point-test-data
+  '(("http://1.gnu.org" 1  url "http://1.gnu.org")
+    ("http://2.gnu.org" 6 url "http://2.gnu.org")
+    ("http://3.gnu.org" 19 url "http://3.gnu.org")
+    ("https://4.gnu.org" 1  url "https://4.gnu.org")
+    ("bzr://savannah.gnu.org" 1 url "bzr://savannah.gnu.org")
+    ("A geo URI (geo:3.14159,-2.71828)." 12 url "geo:3.14159,-2.71828")
+    ("Visit http://5.gnu.org now." 5 url nil)
+    ("Visit http://6.gnu.org now." 7 url "http://6.gnu.org")
+    ("Visit http://7.gnu.org now." 22 url "http://7.gnu.org")
+    ("Visit http://8.gnu.org now." 22 url "http://8.gnu.org")
+    ("Visit http://9.gnu.org now." 24 url nil)
+    ;; Invalid URIs
+    ("<<<<" 2 url nil)
+    ("<>" 1 url nil)
+    ("<url:>" 1 url nil)
+    ("http://" 1 url nil)
+    ;; Invalid schema
+    ("foo://www.gnu.org" 1 url nil)
+    ("foohttp://www.gnu.org" 1 url nil)
+    ;; Non alphanumeric characters can be found in URIs
+    ("ftp://example.net/~foo!;#bar=baz&goo=bob" 3 url "ftp://example.net/~foo!;#bar=baz&goo=bob")
+    ("bzr+ssh://user@example.net:5/a%20d,5" 34 url "bzr+ssh://user@example.net:5/a%20d,5")
+    ;; <url:...> markup
+    ("Url: <url:foo://1.example.com>..." 8 url "foo://1.example.com")
+    ("Url: <url:foo://2.example.com>..." 30 url "foo://2.example.com")
+    ("Url: <url:foo://www.gnu.org/a bc>..." 20 url "foo://www.gnu.org/a bc")
+    ;; Hack used by thing-at-point: drop punctuation at end of URI.
+    ("Go to http://www.gnu.org, for details" 7 url "http://www.gnu.org")
+    ("Go to http://www.gnu.org." 24 url "http://www.gnu.org")
+    ;; Standard URI delimiters
+    ("Go to \"http://10.gnu.org\"." 8 url "http://10.gnu.org")
+    ("Go to \"http://11.gnu.org/\"." 26 url "http://11.gnu.org/")
+    ("Go to <http://12.gnu.org> now." 8 url "http://12.gnu.org")
+    ("Go to <http://13.gnu.org> now." 24 url "http://13.gnu.org")
+    ;; Parenthesis handling (non-standard)
+    ("http://example.com/a(b)c" 21 url "http://example.com/a(b)c")
+    ("http://example.com/a(b)" 21 url "http://example.com/a(b)")
+    ("(http://example.com/abc)" 2 url "http://example.com/abc")
+    ("This (http://example.com/a(b))" 7 url "http://example.com/a(b)")
+    ("This (http://example.com/a(b))" 30 url "http://example.com/a(b)")
+    ("This (http://example.com/a(b))" 5 url nil)
+    ("http://example.com/ab)c" 4 url "http://example.com/ab)c")
+    ;; URL markup, lacking schema
+    ("<url:foo@example.com>" 1 url "mailto:foo@example.com")
+    ("<url:ftp.example.net/abc/>" 1 url "ftp://ftp.example.net/abc/"))
+  "List of thing-at-point tests.
+Each list element should have the form
+
+  (STRING POS THING RESULT)
+
+where STRING is a string of buffer contents, POS is the value of
+point, THING is a symbol argument for `thing-at-point', and
+RESULT should be the result of calling `thing-at-point' from that
+position to retrieve THING.")
+
+(ert-deftest thing-at-point-tests ()
+  "Test the file-local variables implementation."
+  (dolist (test thing-at-point-test-data)
+    (with-temp-buffer
+      (insert (nth 0 test))
+      (goto-char (nth 1 test))
+      (should (equal (thing-at-point (nth 2 test)) (nth 3 test))))))
+
+;;; thingatpt.el ends here
diff --git a/test/automated/undo-tests.el b/test/automated/undo-tests.el
new file mode 100644
index 00000000000..3037db03602
--- /dev/null
+++ b/test/automated/undo-tests.el
@@ -0,0 +1,231 @@
+;;; undo-tests.el --- Tests of primitive-undo
+
+;; Copyright (C) 2012  Aaron S. Hawley
+
+;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com>
+
+;; This program is free software: you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+
+;;; Commentary:
+
+;; Profiling when the code was translate from C to Lisp on 2012-12-24.
+
+;;; C
+
+;; (elp-instrument-function 'primitive-undo)
+;; (load-file "undo-test.elc")
+;; (benchmark 100 '(let ((undo-test5-error nil)) (undo-test-all)))
+;; Elapsed time: 305.218000s (104.841000s in 14804 GCs)
+;; M-x elp-results
+;; Function Name   Call Count  Elapsed Time  Average Time
+;; primitive-undo  2600        3.4889999999  0.0013419230
+
+;;; Lisp
+
+;; (load-file "primundo.elc")
+;; (elp-instrument-function 'primitive-undo)
+;; (benchmark 100 '(undo-test-all))
+;; Elapsed time: 295.974000s (104.582000s in 14704 GCs)
+;; M-x elp-results
+;; Function Name   Call Count  Elapsed Time  Average Time
+;; primitive-undo  2700        3.6869999999  0.0013655555
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest undo-test0 ()
+  "Test basics of \\[undo]."
+  (with-temp-buffer
+    (buffer-enable-undo)
+    (condition-case err
+      (undo)
+      (error
+       (unless (string= "No further undo information"
+                        (cadr err))
+         (error err))))
+    (undo-boundary)
+    (insert "This")
+    (undo-boundary)
+    (erase-buffer)
+    (undo-boundary)
+    (insert "That")
+    (undo-boundary)
+    (forward-word -1)
+    (undo-boundary)
+    (insert "With ")
+    (undo-boundary)
+    (forward-word -1)
+    (undo-boundary)
+    (kill-word 1)
+    (undo-boundary)
+    (put-text-property (point-min) (point-max) 'face 'bold)
+    (undo-boundary)
+    (remove-text-properties (point-min) (point-max) '(face default))
+    (undo-boundary)
+    (set-buffer-multibyte (not enable-multibyte-characters))
+    (undo-boundary)
+    (undo)
+    (should
+     (equal (should-error (undo-more nil))
+            '(wrong-type-argument number-or-marker-p nil)))
+    (undo-more 7)
+    (should (string-equal "" (buffer-string)))))
+
+(ert-deftest undo-test1 ()
+  "Test undo of \\[undo] command (redo)."
+  (with-temp-buffer
+    (buffer-enable-undo)
+    (undo-boundary)
+    (insert "This")
+    (undo-boundary)
+    (erase-buffer)
+    (undo-boundary)
+    (insert "That")
+    (undo-boundary)
+    (forward-word -1)
+    (undo-boundary)
+    (insert "With ")
+    (undo-boundary)
+    (forward-word -1)
+    (undo-boundary)
+    (kill-word 1)
+    (undo-boundary)
+    (facemenu-add-face 'bold (point-min) (point-max))
+    (undo-boundary)
+    (set-buffer-multibyte (not enable-multibyte-characters))
+    (undo-boundary)
+    (should
+     (string-equal (buffer-string)
+                   (progn
+                     (undo)
+                     (undo-more 4)
+                     (undo)
+                     ;(undo-more -4)
+                     (buffer-string))))))
+
+(ert-deftest undo-test2 ()
+  "Test basic redoing with \\[undo] command."
+  (with-temp-buffer
+    (buffer-enable-undo)
+    (undo-boundary)
+    (insert "One")
+    (undo-boundary)
+    (insert " Zero")
+    (undo-boundary)
+    (push-mark)
+    (delete-region (save-excursion
+                     (forward-word -1)
+                     (point)) (point))
+    (undo-boundary)
+    (beginning-of-line)
+    (insert "Zero")
+    (undo-boundary)
+    (undo)
+    (should
+     (string-equal (buffer-string)
+                   (progn
+                     (undo-more 2)
+                     (undo)
+                     (buffer-string))))))
+
+(ert-deftest undo-test3 ()
+  "Test modtime with \\[undo] command."
+  (let ((tmpfile (make-temp-file "undo-test3")))
+    (with-temp-file tmpfile
+      (let ((buffer-file-name tmpfile))
+        (buffer-enable-undo)
+        (set (make-local-variable 'make-backup-files) nil)
+        (undo-boundary)
+        (insert ?\s)
+        (undo-boundary)
+        (basic-save-buffer)
+        (insert ?\t)
+        (undo)
+        (should
+         (string-equal (buffer-string)
+                       (progn
+                         (undo)
+                         (buffer-string)))))
+      (delete-file tmpfile))))
+
+(ert-deftest undo-test4 ()
+  "Test \\[undo] of \\[flush-lines]."
+  (with-temp-buffer
+    (buffer-enable-undo)
+    (dotimes (i 1048576)
+      (if (zerop (% i 2))
+          (insert "Evenses")
+        (insert "Oddses")))
+    (undo-boundary)
+    (should
+     ;; Avoid string-equal because ERT will save the `buffer-string'
+     ;; to the explanation.  Using `not' will record nil or non-nil.
+     (not
+      (null
+       (string-equal (buffer-string)
+                     (progn
+                       (flush-lines "oddses" (point-min) (point-max))
+                       (undo-boundary)
+                       (undo)
+                       (undo)
+                       (buffer-string))))))))
+
+(ert-deftest undo-test5 ()
+  "Test basic redoing with \\[undo] command."
+  (with-temp-buffer
+    (buffer-enable-undo)
+    (undo-boundary)
+    (insert "AYE")
+    (undo-boundary)
+    (insert " BEE")
+    (undo-boundary)
+    (setq buffer-undo-list (cons '(0.0 bogus) buffer-undo-list))
+    (push-mark)
+    (delete-region (save-excursion
+                     (forward-word -1)
+                     (point)) (point))
+    (undo-boundary)
+    (beginning-of-line)
+    (insert "CEE")
+    (undo-boundary)
+    (undo)
+    (setq buffer-undo-list (cons "bogus" buffer-undo-list))
+    (should
+     (string-equal
+      (buffer-string)
+      (progn
+        (if (and (boundp 'undo-test5-error) (not undo-test5-error))
+            (progn
+              (should (null (undo-more 2)))
+              (should (undo)))
+          ;; Errors are generated by new Lisp version of
+          ;; `primitive-undo' not by built-in C version.
+          (should
+           (equal (should-error (undo-more 2))
+                  '(error "Unrecognized entry in undo list (0.0 bogus)")))
+          (should
+           (equal (should-error (undo))
+                  '(error "Unrecognized entry in undo list \"bogus\""))))
+        (buffer-string))))))
+
+(defun undo-test-all (&optional interactive)
+  "Run all tests for \\[undo]."
+  (interactive "p")
+  (if interactive
+      (ert-run-tests-interactively "^undo-")
+    (ert-run-tests-batch "^undo-")))
+
+(provide 'undo-tests)
+;;; undo-tests.el ends here
diff --git a/test/automated/url-future-tests.el b/test/automated/url-future-tests.el
index d499da6dbe2..02ed3285479 100644
--- a/test/automated/url-future-tests.el
+++ b/test/automated/url-future-tests.el
@@ -1,6 +1,6 @@
 ;;; url-future-tests.el --- Test suite for url-future.
 
-;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: data
diff --git a/test/automated/url-util-tests.el b/test/automated/url-util-tests.el
index 65eb37ce926..3955b078dab 100644
--- a/test/automated/url-util-tests.el
+++ b/test/automated/url-util-tests.el
@@ -1,6 +1,6 @@
 ;;; url-util-tests.el --- Test suite for url-util.
 
-;; Copyright (C) 2012  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: data
diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el
index 94f8502b882..2776435be82 100644
--- a/test/automated/vc-bzr.el
+++ b/test/automated/vc-bzr.el
@@ -1,6 +1,6 @@
 ;;; vc-bzr.el --- tests for vc/vc-bzr.el
 
-;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Glenn Morris <rgm@gnu.org>
 
diff --git a/test/automated/xml-parse-tests.el b/test/automated/xml-parse-tests.el
index 35009ed36a2..874ae01affb 100644
--- a/test/automated/xml-parse-tests.el
+++ b/test/automated/xml-parse-tests.el
@@ -1,6 +1,6 @@
 ;;; xml-parse-tests.el --- Test suite for XML parsing.
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/cedet/cedet-utests.el b/test/cedet/cedet-utests.el
index f5df51dc4c9..0a6fc63e6e8 100644
--- a/test/cedet/cedet-utests.el
+++ b/test/cedet/cedet-utests.el
@@ -1,6 +1,6 @@
 ;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/ede-tests.el b/test/cedet/ede-tests.el
index f73e4bed63f..1aa8b403bc3 100644
--- a/test/cedet/ede-tests.el
+++ b/test/cedet/ede-tests.el
@@ -1,6 +1,6 @@
 ;;; ede-tests.el --- Some tests for the Emacs Development Environment
 
-;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/semantic-ia-utest.el b/test/cedet/semantic-ia-utest.el
index c523e103669..9907dd9860e 100644
--- a/test/cedet/semantic-ia-utest.el
+++ b/test/cedet/semantic-ia-utest.el
@@ -1,6 +1,6 @@
 ;;; semantic-ia-utest.el --- Analyzer unit tests
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/semantic-tests.el b/test/cedet/semantic-tests.el
index 22b959016c1..c8a4a4cc6ad 100644
--- a/test/cedet/semantic-tests.el
+++ b/test/cedet/semantic-tests.el
@@ -1,6 +1,6 @@
 ;;; semantic-utest.el --- Miscellaneous Semantic tests.
 
-;;; Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc.
+;;; Copyright (C) 2003-2004, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/cedet/semantic-utest-c.el b/test/cedet/semantic-utest-c.el
index c500f543187..bd94f8536d7 100644
--- a/test/cedet/semantic-utest-c.el
+++ b/test/cedet/semantic-utest-c.el
@@ -1,6 +1,6 @@
 ;;; semantic-utest-c.el --- C based parsing tests.
 
-;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el
index 728106d863c..adfa31dec4e 100644
--- a/test/cedet/semantic-utest.el
+++ b/test/cedet/semantic-utest.el
@@ -1,6 +1,6 @@
 ;;; semantic-utest.el --- Tests for semantic's parsing system.
 
-;;; Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc.
+;;; Copyright (C) 2003-2004, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el
index d0239f627b3..7ab301898c1 100644
--- a/test/cedet/srecode-tests.el
+++ b/test/cedet/srecode-tests.el
@@ -1,6 +1,6 @@
 ;;; srecode-tests.el --- Some tests for CEDET's srecode
 
-;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/test.c b/test/cedet/tests/test.c
index b2d9971ff4f..d3104ea8272 100644
--- a/test/cedet/tests/test.c
+++ b/test/cedet/tests/test.c
@@ -1,6 +1,6 @@
 /* test.c --- Semantic unit test for C.
 
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/test.el b/test/cedet/tests/test.el
index a07a9316f35..f67004aab3e 100644
--- a/test/cedet/tests/test.el
+++ b/test/cedet/tests/test.el
@@ -1,6 +1,6 @@
 ;;; test.el --- Unit test file for Semantic Emacs Lisp support.
 
-;; Copyright (C) 2005-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/test.make b/test/cedet/tests/test.make
index cc9d450c1e0..57b58b58599 100644
--- a/test/cedet/tests/test.make
+++ b/test/cedet/tests/test.make
@@ -1,6 +1,6 @@
 # test.make --- Semantic unit test for Make -*- makefile -*-
 
-# Copyright (C) 2001-2002, 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2010-2013 Free Software Foundation, Inc.
 
 # Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testdoublens.cpp b/test/cedet/tests/testdoublens.cpp
index 72a7e10dc5a..e398f1c8261 100644
--- a/test/cedet/tests/testdoublens.cpp
+++ b/test/cedet/tests/testdoublens.cpp
@@ -1,6 +1,6 @@
 // testdoublens.cpp --- semantic-ia-utest completion engine unit tests
 
-// Copyright (C) 2008-2012 Free Software Foundation, Inc.
+// Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testdoublens.hpp b/test/cedet/tests/testdoublens.hpp
index 69475ee3c19..5dbe12cdf4b 100644
--- a/test/cedet/tests/testdoublens.hpp
+++ b/test/cedet/tests/testdoublens.hpp
@@ -1,6 +1,6 @@
 // testdoublens.hpp --- Header file used in one of the Semantic tests
 
-// Copyright (C) 2008-2012 Free Software Foundation, Inc.
+// Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testjavacomp.java b/test/cedet/tests/testjavacomp.java
index 54b9f4aa004..f716c9ad2d3 100644
--- a/test/cedet/tests/testjavacomp.java
+++ b/test/cedet/tests/testjavacomp.java
@@ -1,6 +1,6 @@
 //  testjavacomp.java --- Semantic unit test for Java
 
-// Copyright (C) 2009-2012  Free Software Foundation, Inc.
+// Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 //  Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp
index 2108da14e56..f21b3ef57f7 100644
--- a/test/cedet/tests/testpolymorph.cpp
+++ b/test/cedet/tests/testpolymorph.cpp
@@ -1,6 +1,6 @@
 /** testpolymorph.cpp --- A sequence of polymorphism examples.
  *
- * Copyright (C) 2009-2012  Free Software Foundation, Inc.
+ * Copyright (C) 2009-2013 Free Software Foundation, Inc.
  *
  * Author: Eric M. Ludlam <eric@siege-engine.com>
  *
diff --git a/test/cedet/tests/testspp.c b/test/cedet/tests/testspp.c
index 1fbabd62d14..f63dec0c407 100644
--- a/test/cedet/tests/testspp.c
+++ b/test/cedet/tests/testspp.c
@@ -1,6 +1,6 @@
 /* testspp.cpp --- Semantic unit test for the C preprocessor
 
-   Copyright (C) 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testsppreplace.c b/test/cedet/tests/testsppreplace.c
index 36b4cb5fa57..629128c8d8f 100644
--- a/test/cedet/tests/testsppreplace.c
+++ b/test/cedet/tests/testsppreplace.c
@@ -1,5 +1,5 @@
 /* testsppreplace.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testsppreplaced.c b/test/cedet/tests/testsppreplaced.c
index 19e3b7ec869..3c2b1a04f5b 100644
--- a/test/cedet/tests/testsppreplaced.c
+++ b/test/cedet/tests/testsppreplaced.c
@@ -1,5 +1,5 @@
 /* testsppreplaced.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testsubclass.cpp b/test/cedet/tests/testsubclass.cpp
index 3fb61053a41..a3b4ec4db2a 100644
--- a/test/cedet/tests/testsubclass.cpp
+++ b/test/cedet/tests/testsubclass.cpp
@@ -1,6 +1,6 @@
 // testsubclass.cpp --- unit test for analyzer and complex C++ inheritance
 
-// Copyright (C) 2007-2012 Free Software Foundation, Inc.
+// Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testsubclass.hh b/test/cedet/tests/testsubclass.hh
index dee470b899f..125e801b69d 100644
--- a/test/cedet/tests/testsubclass.hh
+++ b/test/cedet/tests/testsubclass.hh
@@ -1,6 +1,6 @@
 // testsubclass.hh --- unit test for analyzer and complex C++ inheritance
 
-// Copyright (C) 2007-2012 Free Software Foundation, Inc.
+// Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testtypedefs.cpp b/test/cedet/tests/testtypedefs.cpp
index f3666bea316..ce59b6de0df 100644
--- a/test/cedet/tests/testtypedefs.cpp
+++ b/test/cedet/tests/testtypedefs.cpp
@@ -1,6 +1,6 @@
 // testtypedefs.cpp --- Sample with some fake bits out of std::string
 
-// Copyright (C) 2008-2012 Free Software Foundation, Inc.
+// Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 // Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/cedet/tests/testvarnames.c b/test/cedet/tests/testvarnames.c
index 5cade2f0bd8..a252b9d9925 100644
--- a/test/cedet/tests/testvarnames.c
+++ b/test/cedet/tests/testvarnames.c
@@ -1,7 +1,7 @@
 /* testvarnames.cpp
    Test variable and function names, lists of variables on one line, etc.
 
-   Copyright (C) 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
    Author: Eric M. Ludlam <eric@siege-engine.com>
 
diff --git a/test/eshell.el b/test/eshell.el
index 4d6480c81bb..7baeb58a56a 100644
--- a/test/eshell.el
+++ b/test/eshell.el
@@ -1,6 +1,6 @@
 ;;; esh-test.el --- Eshell test suite
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 4c2fa6c8435..bc7784f1ba2 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -1,4 +1,4 @@
-## -*- octave -*-
+## -*- mode: octave; coding: utf-8 -*-
 
 function res = tcomp (fn)
   %% res = tcomp (fn)
@@ -35,7 +35,7 @@ function res = tcomp (fn)
 
 endfunction
 
-## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg
+## Copyright (C) 2005, 2006, 2007, 2008, 2009 Søren Hauberg
 ##
 ## This file is part of Octave.
 ##
diff --git a/test/indent/pascal.pas b/test/indent/pascal.pas
index 07a21f23c3c..0dda0c47fef 100644
--- a/test/indent/pascal.pas
+++ b/test/indent/pascal.pas
@@ -1,6 +1,6 @@
 { GPC demo program for the CRT unit.
 
-Copyright (C) 1999-2006 Free Software Foundation, Inc.
+Copyright (C) 1999-2006, 2013 Free Software Foundation, Inc.
 
 Author: Frank Heckenbach <frank@pascal.gnu.de>
 
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 As a special exception, if you incorporate even large parts of the
 code of this demo program into another program with substantially
@@ -27,6 +25,8 @@ by the GNU General Public License. }
 
 {$gnu-pascal,I+}
 
+// Free-pascal style comment.
+
 program CRTDemo;
 
 uses GPC, CRT;
diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index 6f3447c3aa9..790656501d1 100755
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -5,6 +5,18 @@ setlock -n /tmp/getmail.lock && echo getmail isn\'t running
 
 # adsgsdg
 
+case $X in
+    foo)
+        do_something
+        ;;
+    arg=*)                      # bug#12953
+        do_something_else_based_on_arg
+        ;;
+    *)
+        default
+        ;;
+esac
+
 echo -n $(( 5 << 2 ))
 # This should not be treated as a heredoc (bug#12770).
 2
diff --git a/test/redisplay-testsuite.el b/test/redisplay-testsuite.el
index 39f81a13c60..a710bc87a39 100644
--- a/test/redisplay-testsuite.el
+++ b/test/redisplay-testsuite.el
@@ -1,6 +1,6 @@
 ;;; redisplay-testsuite.el --- Test suite for redisplay.
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/rmailmm.el b/test/rmailmm.el
index 6844eb8187b..8f33b1d11f9 100644
--- a/test/rmailmm.el
+++ b/test/rmailmm.el
@@ -1,6 +1,6 @@
 ;;; rmailmm.el --- tests for mail/rmailmm.el
 
-;; Copyright (C) 2006-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.