aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2015-01-28 01:08:18 -0300
committerFabián Ezequiel Gallina2015-01-28 01:08:18 -0300
commit95a2cb24b0697558e6629460d8bc693b394f0138 (patch)
treecf6cc03950fc6b0982497f00ff6c92eec1912b45 /src/ChangeLog
parentf5ebe84d75bb75156db9e2e0a7ab356941b4ea75 (diff)
parent9664defd262252faf037c5fe1ea095f1cc4b308b (diff)
downloademacs-95a2cb24b0697558e6629460d8bc693b394f0138.tar.gz
emacs-95a2cb24b0697558e6629460d8bc693b394f0138.zip
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
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d46e34c8525..8efc90727e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
12015-01-27 Eli Zaretskii <eliz@gnu.org>
2
3 * dired.c (directory_files_internal) [WINDOWSNT]: If readdir
4 returns NULL and errno is ENOTDIR, behave as if opendir failed to
5 open the directory. (Bug#19701)
6
7 * w32.c (sys_readdir): If FindFirstFile fails because the
8 directory doesn't exist, set errno to ENOTDIR.
9
102015-01-24 Jan Djärv <jan.h.d@swipnet.se>
11
12 * nsterm.m (drawRect:): Add block/unblock_input (Bug#19660).
13
12015-01-21 Paul Eggert <eggert@cs.ucla.edu> 142015-01-21 Paul Eggert <eggert@cs.ucla.edu>
2 15
3 Fix coding.c subscript error 16 Fix coding.c subscript error