| commit | 95a2cb24b0697558e6629460d8bc693b394f0138 | |
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | |
| Wed, 28 Jan 2015 04:08:18 +0000 (28 01:08 -0300) | ||
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | |
| Wed, 28 Jan 2015 04:08:18 +0000 (28 01:08 -0300) | ||
| tree | cf6cc03950fc6b0982497f00ff6c92eec1912b45 | treesnapshot (tar.gz zip) |
| parent | f5ebe84d75bb75156db9e2e0a7ab356941b4ea75 | commitdiff |
| parent | 9664defd262252faf037c5fe1ea095f1cc4b308b | commitdiff |
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
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