(x_catch_errors, x_check_errors, x_had_errors_p)

[bpt/emacs.git] / src / dired.c

diff --git a/src/dired.c b/src/dired.c
index cb1a8d8..b8ba01b 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -80,8 +80,8 @@ extern struct direct *readdir ();
 
 #include "regex.h"
 
-/* A search buffer, with a fastmap allocated and ready to go.  */
-extern struct re_pattern_buffer searchbuf;
+/* Returns a search buffer, with a fastmap allocated and ready to go.  */
+extern struct re_pattern_buffer *compile_pattern ();
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 
@@ -116,6 +116,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\
   int length;
   Lisp_Object list, name, dirfilename;
   Lisp_Object handler;
+  struct re_pattern_buffer *bufp;
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
@@ -154,14 +155,14 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\
         catching and signalling our own errors, we just call
         compile_pattern to do the work for us.  */
 #ifdef VMS
-      compile_pattern (match, &searchbuf, 0,
-                      buffer_defaults.downcase_table->contents);
+      bufp = compile_pattern (match, 0,
+                             buffer_defaults.downcase_table->contents);
 #else
-      compile_pattern (match, &searchbuf, 0, 0);
+      bufp = compile_pattern (match, 0, 0);
 #endif
     }
 
-  /* Now searchbuf is the compiled form of MATCH; don't call anything
+  /* Now *bufp is the compiled form of MATCH; don't call anything
      which might compile a new regexp until we're done with the loop!  */
 
   /* Do this opendir after anything which might signal an error; if
@@ -186,7 +187,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\
       if (DIRENTRY_NONEMPTY (dp))
        {
          if (NILP (match)
-             || (0 <= re_search (&searchbuf, dp->d_name, len, 0, len, 0)))
+             || (0 <= re_search (bufp, dp->d_name, len, 0, len, 0)))
            {
              if (!NILP (full))
                {
@@ -233,13 +234,6 @@ Returns nil if DIR contains no name starting with FILE.")
      Lisp_Object file, dirname;
 {
   Lisp_Object handler;
-  /* Don't waste time trying to complete a null string.
-     Besides, this case happens when user is being asked for
-     a directory name and has supplied one ending in a /.
-     We would not want to add anything in that case
-     even if there are some unique characters in that directory.  */
-  if (STRINGP (file) && XSTRING (file)->size == 0)
-    return file;
 
   /* If the file name has special constructs in it,
      call the corresponding file handler.  */
@@ -351,7 +345,17 @@ file_name_completion (file, dirname, all_flag, ver_flag)
 
           directoryp = ((st.st_mode & S_IFMT) == S_IFDIR);
          tem = Qnil;
-          if (!directoryp)
+          if (directoryp)
+           {
+#ifndef TRIVIAL_DIRECTORY_ENTRY
+#define TRIVIAL_DIRECTORY_ENTRY(n) (!strcmp (n, ".") || !strcmp (n, ".."))
+#endif
+             /* "." and ".." are never interesting as completions, but are
+                actually in the way in a directory contains only one file.  */
+             if (!passcount && TRIVIAL_DIRECTORY_ENTRY (dp->d_name))
+               continue;
+           }
+         else
             {
              /* Compare extensions-to-be-ignored against end of this file name */
              /* if name is not an exact match against specified string */
@@ -382,7 +386,7 @@ file_name_completion (file, dirname, all_flag, ver_flag)
            {
              Lisp_Object regexps;
              Lisp_Object zero;
-             XFASTINT (zero) = 0;
+             XSETFASTINT (zero, 0);
 
              /* Ignore this element if it fails to match all the regexps.  */
              for (regexps = Vcompletion_regexp_list; CONSP (regexps);