diff options
| author | Kim F. Storm | 2002-05-27 22:06:29 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2002-05-27 22:06:29 +0000 |
| commit | 93ed5f9da730fafe0736922e31fcebe926eb2c92 (patch) | |
| tree | 0d17aef37feada08c44b1f5599bfa375b29231ff /src | |
| parent | fda1acc53d76140e18609eb8f048f0d16183fe09 (diff) | |
| download | emacs-93ed5f9da730fafe0736922e31fcebe926eb2c92.tar.gz emacs-93ed5f9da730fafe0736922e31fcebe926eb2c92.zip | |
(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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/callint.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/callint.c b/src/callint.c index 63f32418954..d172c118a92 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -34,6 +34,7 @@ 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; |
| @@ -520,17 +521,18 @@ supply if the command inquires which events were used to invoke it. */) | |||
| 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 */ |