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

4 files changed, 44 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d46e34c8525..8efc90727e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2015-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (directory_files_internal) [WINDOWSNT]: If readdir
+        returns NULL and errno is ENOTDIR, behave as if opendir failed to
+        open the directory.  (Bug#19701)
+
+        * w32.c (sys_readdir): If FindFirstFile fails because the
+        directory doesn't exist, set errno to ENOTDIR.
+
+2015-01-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (drawRect:): Add block/unblock_input (Bug#19660).
+
 2015-01-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix coding.c subscript error
diff --git a/src/dired.c b/src/dired.c
index e31fdf87ac2..757eb6d30cd 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -238,6 +238,19 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
               QUIT;
               continue;
             }
+#ifdef WINDOWSNT
+          /* The MS-Windows implementation of 'opendir' doesn't
+             actually open a directory until the first call to
+             'readdir'.  If 'readdir' fails to open the directory, it
+             sets errno to ENOTDIR; we convert it here to ENOENT so
+             that the error message is similar to what happens on
+             Posix hosts in such cases.  */
+          if (errno == ENOTDIR)
+            {
+              errno = ENOENT;
+              report_file_error ("Opening directory", directory);
+            }
+#endif
           break;
         }
 
diff --git a/src/nsterm.m b/src/nsterm.m
index ee1268ef850..e90c3d70db3 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6773,7 +6773,9 @@ if (cols > 0 && rows > 0)
     return;
 
   ns_clear_frame_area (emacsframe, x, y, width, height);
+  block_input ();
   expose_frame (emacsframe, x, y, width, height);
+  unblock_input ();
 
   /*
     drawRect: may be called (at least in OS X 10.5) for invisible
diff --git a/src/w32.c b/src/w32.c
index 31b13289b57..acd06ba2601 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3433,7 +3433,22 @@ sys_readdir (DIR *dirp)
         }
 
       if (dir_find_handle == INVALID_HANDLE_VALUE)
-        return NULL;
+        {
+          switch (GetLastError ())
+            {
+            case ERROR_PATH_NOT_FOUND:
+            case ERROR_ACCESS_DENIED:
+            case ERROR_INVALID_DRIVE:
+            case ERROR_BAD_NETPATH:
+              /* This special value will be noticed by
+                 directory_files_internal, which see.  */
+              errno = ENOTDIR;
+              break;
+            default:
+              break;
+            }
+          return NULL;
+        }
     }
   else if (w32_unicode_filenames)
     {