diff options
author | Richard M. Stallman <[email protected]> | 1998-05-05 19:32:02 +0000 |
---|---|---|
committer | Richard M. Stallman <[email protected]> | 1998-05-05 19:32:02 +0000 |
commit | 643c73b90bcfd4f0eafd5681a3539ef49a29821c (patch) | |
tree | 89dd965ade3cc31b44b116d762ff2ffcc5a7cea5 /src/fileio.c | |
parent | a558a05d61acede40cb8f11fb1d2d74f1f142846 (diff) |
(barf_or_query_if_file_exists): Encode file name.
(Finsert_file_contents): Don't use gap pos to set point
if del_range_byte deleted 0 characters.
Diffstat (limited to 'src/fileio.c')
-rw-r--r-- | src/fileio.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c index 099c9e6964..d97e05c37f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2144,13 +2144,15 @@ barf_or_query_if_file_exists (absname, querystring, interactive, statptr, quick) struct stat *statptr; int quick; { - register Lisp_Object tem; + register Lisp_Object tem, encoded_filename; struct stat statbuf; struct gcpro gcpro1; + encoded_filename = ENCODE_FILE (absname); + /* stat is a good way to tell whether the file exists, regardless of what access permissions it has. */ - if (stat (XSTRING (absname)->data, &statbuf) >= 0) + if (stat (XSTRING (encoded_filename)->data, &statbuf) >= 0) { if (! interactive) Fsignal (Qfile_already_exists, @@ -3762,7 +3764,14 @@ This does code conversion according to the value of\n\ we are taking from the file. */ inserted -= (Z_BYTE - same_at_end) + (same_at_start - BEG_BYTE); del_range_byte (same_at_start, same_at_end, 0); - SET_PT_BOTH (GPT, GPT_BYTE); + if (same_at_end != same_at_start) + SET_PT_BOTH (GPT, GPT_BYTE); + else + { + /* Insert from the file at the proper position. */ + temp = BYTE_TO_CHAR (same_at_start); + SET_PT_BOTH (temp, same_at_start); + } insert_1 (conversion_buffer + same_at_start - BEG_BYTE, inserted, 0, 0, 0); |