comparison src/dired.c @ 48906:141c4fba25c0

(file_name_completion): Fix that change. Delete special quit-handling code; just use QUIT.

48905:0d51b82bd792

     ** It would not actually be helpful to the user to ignore any possible
     completions when making a list of them.**  */

  for (passcount = !!all_flag; NILP (bestmatch) && passcount < 2; passcount++)
    {
      d = opendir (SDATA (Fdirectory_file_name (encoded_dir)));
      if (!d)
	report_file_error ("Opening directory", Fcons (dirname, Qnil));

      record_unwind_protect (directory_files_internal_unwind,

#endif
	  if (!dp) break;

	  len = NAMLEN (dp);

	  if (!NILP (Vquit_flag) && NILP (Vinhibit_quit))
	    goto quit;
	  if (! DIRENTRY_NONEMPTY (dp)
	      || len < SCHARS (encoded_file)
	      || 0 <= scmp (dp->d_name, SDATA (encoded_file),
			    SCHARS (encoded_file)))
	    continue;

		  && IS_ANY_SEP (p1[matchsize]))
		matchsize++;
	      bestmatchsize = matchsize;
	    }
	}
      closedir (d);
      /* Discard the unwind protect.  */
      specpdl_ptr = specpdl + count;
    }

  UNGCPRO;

  if (all_flag || NILP (bestmatch))
    {
      if (STRINGP (bestmatch))
	bestmatch = DECODE_FILE (bestmatch);

			  make_number (bestmatchsize));
  /* Now that we got the right initial segment of BESTMATCH,
     decode it from the coding system in use.  */
  bestmatch = DECODE_FILE (bestmatch);
  return bestmatch;

 quit:
  if (d) closedir (d);
  /* Discard the unwind protect.  */
  specpdl_ptr = specpdl + count;
  Vquit_flag = Qnil;
  return Fsignal (Qquit, Qnil);
}

/* Compare exactly LEN chars of strings at S1 and S2,
   ignoring case if appropriate.
   Return -1 if strings match,

48906:141c4fba25c0

     ** It would not actually be helpful to the user to ignore any possible
     completions when making a list of them.**  */

  for (passcount = !!all_flag; NILP (bestmatch) && passcount < 2; passcount++)
    {
      int inner_count = SPECPDL_INDEX ();

      d = opendir (SDATA (Fdirectory_file_name (encoded_dir)));
      if (!d)
	report_file_error ("Opening directory", Fcons (dirname, Qnil));

      record_unwind_protect (directory_files_internal_unwind,

#endif
	  if (!dp) break;

	  len = NAMLEN (dp);

	  QUIT;
	  if (! DIRENTRY_NONEMPTY (dp)
	      || len < SCHARS (encoded_file)
	      || 0 <= scmp (dp->d_name, SDATA (encoded_file),
			    SCHARS (encoded_file)))
	    continue;

		  && IS_ANY_SEP (p1[matchsize]))
		matchsize++;
	      bestmatchsize = matchsize;
	    }
	}
      /* This closes the directory.  */
      bestmatch = unbind_to (inner_count, bestmatch);
    }

  UNGCPRO;
  bestmatch = unbind_to (count, bestmatch);

  if (all_flag || NILP (bestmatch))
    {
      if (STRINGP (bestmatch))
	bestmatch = DECODE_FILE (bestmatch);

			  make_number (bestmatchsize));
  /* Now that we got the right initial segment of BESTMATCH,
     decode it from the coding system in use.  */
  bestmatch = DECODE_FILE (bestmatch);
  return bestmatch;
}

/* Compare exactly LEN chars of strings at S1 and S2,
   ignoring case if appropriate.
   Return -1 if strings match,