Mercurial > emacs
comparison src/callint.c @ 45546:ce01a38706ee
(Fcall_interactively) <"D">: Supply Qfile_directory_p
predicate for Fread_file_name when reading directory name.
Supply Qnil for predicate in other calls to Fread_file_name.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Mon, 27 May 2002 22:06:29 +0000 |
parents | 08d6b23b2513 |
children | 6d5d3dd50de6 |
comparison
equal
deleted
inserted
replaced
45545:6b37dbf4d2a5 | 45546:ce01a38706ee |
---|---|
32 #ifdef HAVE_INDEX | 32 #ifdef HAVE_INDEX |
33 extern char *index P_ ((const char *, int)); | 33 extern char *index P_ ((const char *, int)); |
34 #endif | 34 #endif |
35 | 35 |
36 extern Lisp_Object Qcursor_in_echo_area; | 36 extern Lisp_Object Qcursor_in_echo_area; |
37 extern Lisp_Object Qfile_directory_p; | |
37 | 38 |
38 Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; | 39 Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; |
39 Lisp_Object Qcall_interactively; | 40 Lisp_Object Qcall_interactively; |
40 Lisp_Object Vcommand_history; | 41 Lisp_Object Vcommand_history; |
41 | 42 |
518 varies[i] = 1; | 519 varies[i] = 1; |
519 break; | 520 break; |
520 | 521 |
521 case 'D': /* Directory name. */ | 522 case 'D': /* Directory name. */ |
522 args[i] = Fread_file_name (build_string (callint_message), Qnil, | 523 args[i] = Fread_file_name (build_string (callint_message), Qnil, |
523 current_buffer->directory, Qlambda, Qnil); | 524 current_buffer->directory, Qlambda, Qnil, |
525 Qfile_directory_p); | |
524 break; | 526 break; |
525 | 527 |
526 case 'f': /* Existing file name. */ | 528 case 'f': /* Existing file name. */ |
527 args[i] = Fread_file_name (build_string (callint_message), | 529 args[i] = Fread_file_name (build_string (callint_message), |
528 Qnil, Qnil, Qlambda, Qnil); | 530 Qnil, Qnil, Qlambda, Qnil, Qnil); |
529 break; | 531 break; |
530 | 532 |
531 case 'F': /* Possibly nonexistent file name. */ | 533 case 'F': /* Possibly nonexistent file name. */ |
532 args[i] = Fread_file_name (build_string (callint_message), | 534 args[i] = Fread_file_name (build_string (callint_message), |
533 Qnil, Qnil, Qnil, Qnil); | 535 Qnil, Qnil, Qnil, Qnil, Qnil); |
534 break; | 536 break; |
535 | 537 |
536 case 'i': /* Ignore an argument -- Does not do I/O */ | 538 case 'i': /* Ignore an argument -- Does not do I/O */ |
537 varies[i] = -1; | 539 varies[i] = -1; |
538 break; | 540 break; |