• Fabián Ezequiel Gallina's avatar
    Merge from origin/emacs-24 · 95a2cb24
    Fabián Ezequiel Gallina authored
    9664defd Signal a file-error from directory-files on MS-Windows  (Bug#19701)
    fd4e65e4 Added missing test for previous commit
    5485e3e5 python.el: New non-global state dependent indentation engine.
    3b23e6a7 Fix the description of --insert command-line option  (Bug#19694)
    7a7e5941 Add a cross-reference in ELisp manual.  (Bug#19668)
    b4f40757 Fixes: debbugs:19660
    83b3c312 * test/automated/regexp-tests.el: Require regexp-opt
    
    Conflicts:
    	lisp/progmodes/python.el
    95a2cb24
nsterm.m 229 KB