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

diff --cc doc/emacs/ChangeLog
Simple merge

diff --cc doc/lispref/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
index a693cc0bdc67dc97ebbd753c8b96aac5057dc11d,b3bedaaffa98d9402a84c9fbb090b1f5faee0bb9..2e5a67ce228744208d7900e5aaa9a265b705ef5e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,30 +1,23 @@@
 -2015-01-22  Wolfgang Jenkner  <wjenkner@inode.at>
 -
 -      * calc/calc-units.el (math-units-in-expr-p)
 -      (math-single-units-in-expr-p, math-find-compatible-unit-rec)
 -      (math-extract-units): Handle the `neg' operator.  (Bug#19582)
 -      [Backport]
 -
+ 2015-01-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+ 
+       python.el: New non-global state dependent indentation engine.
+       (Bug#18319, Bug#19595)
+ 
+       * progmodes/python.el (python-syntax-comment-or-string-p): Accept
+       PPSS as argument.
+       (python-syntax-closing-paren-p): New function.
+       (python-indent-current-level)
+       (python-indent-levels): Mark obsolete.
+       (python-indent-context): Return more context cases.
+       (python-indent--calculate-indentation)
+       (python-indent--calculate-levels): New functions.
+       (python-indent-calculate-levels): Use them.
+       (python-indent-calculate-indentation, python-indent-line):
+       (python-indent-line-function): Rewritten to use new API.
+       (python-indent-dedent-line): Simplify logic.
+       (python-indent-dedent-line-backspace): Use `unless`.
+       (python-indent-toggle-levels): Delete function.
+ 
  2015-01-21  Daniel Koning  <dk@danielkoning.com>  (tiny change)
  
        * subr.el (posnp): Correct docstring of `posnp'.

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/nsterm.m
Simple merge

diff --cc src/w32.c
Simple merge

diff --cc test/ChangeLog
index 61ab8b6595a5fe3ea5ed5d5bf22d4a6b9157253f,62876e9ecae1c87dfb14e523ac4cbcff771a1254..66535ac42a39208d304b589c778f4f5204cfe4eb
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,19 -1,30 +1,46 @@@
+ 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
 +      required at run-time.
 +
 +2015-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * automated/cl-generic-tests.el (cl-generic-test-11-next-method-p):
 +      New test.
 +
 +2015-01-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * indent/shell.sh (bar): Use '[ $# -eq 0 ]', not '[ $# == 0 ]'.
 +      This is more portable in shell scripts.
 +      Fixes: bug#19658
 +
  2015-01-23  Dmitry Gutov  <dgutov@yandex.ru>
  
        Fix package tests when TMPDIR is in HOME.  (Bug#19657)

diff --cc test/automated/python-tests.el
Simple merge