diff options
| author | Richard M. Stallman | 1998-07-02 07:01:56 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-07-02 07:01:56 +0000 |
| commit | a79485afb88f0ebe679b91c128e9c9dd5a98b9a4 (patch) | |
| tree | 74250933658fd1af8a30caa75558474419e93a93 | |
| parent | ccf330a66be0bcd2f961317103a819e03f6a86bb (diff) | |
| download | emacs-a79485afb88f0ebe679b91c128e9c9dd5a98b9a4.tar.gz emacs-a79485afb88f0ebe679b91c128e9c9dd5a98b9a4.zip | |
(Faccess_file): Check type of second argument STRING.
(Fread_file_name): Bind minibuffer-completing-file-name to t.
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 47dfc37ba46..f4bcf1bf775 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -2947,6 +2947,7 @@ If there is no error, we return nil.") | |||
| 2947 | int fd; | 2947 | int fd; |
| 2948 | 2948 | ||
| 2949 | CHECK_STRING (filename, 0); | 2949 | CHECK_STRING (filename, 0); |
| 2950 | CHECK_STRING (string, 1); | ||
| 2950 | 2951 | ||
| 2951 | /* If the file name has special constructs in it, | 2952 | /* If the file name has special constructs in it, |
| 2952 | call the corresponding file handler. */ | 2953 | call the corresponding file handler. */ |
| @@ -5363,11 +5364,13 @@ DIR defaults to current buffer's directory default.") | |||
| 5363 | else | 5364 | else |
| 5364 | insdef = Qnil, insdef1 = Qnil; | 5365 | insdef = Qnil, insdef1 = Qnil; |
| 5365 | 5366 | ||
| 5366 | #ifdef VMS | ||
| 5367 | count = specpdl_ptr - specpdl; | 5367 | count = specpdl_ptr - specpdl; |
| 5368 | #ifdef VMS | ||
| 5368 | specbind (intern ("completion-ignore-case"), Qt); | 5369 | specbind (intern ("completion-ignore-case"), Qt); |
| 5369 | #endif | 5370 | #endif |
| 5370 | 5371 | ||
| 5372 | specbind (intern ("minibuffer-completing-file-name"), Qt); | ||
| 5373 | |||
| 5371 | GCPRO2 (insdef, default_filename); | 5374 | GCPRO2 (insdef, default_filename); |
| 5372 | val = Fcompleting_read (prompt, intern ("read-file-name-internal"), | 5375 | val = Fcompleting_read (prompt, intern ("read-file-name-internal"), |
| 5373 | dir, mustmatch, insdef1, | 5376 | dir, mustmatch, insdef1, |
| @@ -5392,10 +5395,7 @@ DIR defaults to current buffer's directory default.") | |||
| 5392 | val = build_string (""); | 5395 | val = build_string (""); |
| 5393 | } | 5396 | } |
| 5394 | 5397 | ||
| 5395 | #ifdef VMS | ||
| 5396 | unbind_to (count, Qnil); | 5398 | unbind_to (count, Qnil); |
| 5397 | #endif | ||
| 5398 | |||
| 5399 | UNGCPRO; | 5399 | UNGCPRO; |
| 5400 | if (NILP (val)) | 5400 | if (NILP (val)) |
| 5401 | error ("No file name specified"); | 5401 | error ("No file name specified"); |