Merge from origin/emacs-24

9664def Signal a file-error from directory-files on MS-Windows  (Bug#19701)
fd4e65e Added missing test for previous commit
5485e3e5 python.el: New non-global state dependent indentation engine.
3b23e6a Fix the description of --insert command-line option  (Bug#19694)
7a7e594 Add a cross-reference in ELisp manual.  (Bug#19668)
b4f4075 Fixes: debbugs:19660
83b3c31 * test/automated/regexp-tests.el: Require regexp-opt

Conflicts:
	lisp/progmodes/python.el

1 files changed, 27 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 61ab8b6595a..66535ac42a3 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,30 @@
+2015-01-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-indent-pep8-1)
+        (python-indent-pep8-2, python-indent-pep8-3)
+        (python-indent-after-comment-1, python-indent-after-comment-2)
+        (python-indent-inside-paren-1, python-indent-inside-paren-2)
+        (python-indent-after-block-1, python-indent-after-block-2)
+        (python-indent-after-backslash-1, python-indent-after-backslash-2)
+        (python-indent-after-backslash-3, python-indent-block-enders-1)
+        (python-indent-block-enders-2, python-indent-block-enders-3)
+        (python-indent-block-enders-4, python-indent-block-enders-5)
+        (python-indent-dedenters-1, python-indent-dedenters-2)
+        (python-indent-dedenters-3, python-indent-dedenters-4)
+        (python-indent-dedenters-5, python-indent-dedenters-6)
+        (python-indent-dedenters-7, python-indent-dedenters-8): Fix tests.
+        (python-indent-base-case, python-indent-after-block-3)
+        (python-indent-after-backslash-5, python-indent-inside-paren-3)
+        (python-indent-inside-paren-4, python-indent-inside-paren-5)
+        (python-indent-inside-paren-6, python-indent-inside-string-1)
+        (python-indent-inside-string-2, python-indent-inside-string-3)
+        (python-indent-dedent-line-backspace-1): New Tests.
+
+2015-01-24  Glenn Morris  <rgm@gnu.org>
+
+        * automated/regexp-tests.el: Require regexp-opt, which is
+        not preloaded --without-x.
+
 2015-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * automated/cl-generic-tests.el: Try and make sure cl-lib is not