Fabián Ezequiel Gallina 95a2cb24b0 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		2015-01-28 01:08:18 -03:00
..
emacs	Merge from origin/emacs-24	2015-01-28 01:08:18 -03:00
lispintro	Fix copyright years by hand	2015-01-01 14:27:34 -08:00
lispref	Merge from origin/emacs-24	2015-01-28 01:08:18 -03:00
man	Merge from origin/emacs-24	2015-01-28 00:09:39 -03:00
misc	Merge from origin/emacs-24	2015-01-28 00:09:39 -03:00