diff options
| author | Miles Bader | 2004-10-04 01:04:18 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-10-04 01:04:18 +0000 |
| commit | d3857d85ab7e18b5dafdb6395e811bb566f8184b (patch) | |
| tree | 8ca58a68eabf852a340c3757e81a4f74b23f4c6d /src | |
| parent | b9b1c01690ef9e061dfa2a2c37ca4e7892a1172a (diff) | |
| parent | dd166d5fa1712b0dda35859c91d89666c2873471 (diff) | |
| download | emacs-d3857d85ab7e18b5dafdb6395e811bb566f8184b.tar.gz emacs-d3857d85ab7e18b5dafdb6395e811bb566f8184b.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-50
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-587
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-588
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-589
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-590
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-593
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-39
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-40
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-41
Update from CVS
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 18 | ||||
| -rw-r--r-- | src/fileio.c | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 266b62588ea..e58ddb74284 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,21 @@ | |||
| 1 | 2004-10-03 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * fileio.c (auto_save_1) Call Ffile_modes for remote files. | ||
| 4 | |||
| 5 | 2004-09-30 Kenichi Handa <handa@m17n.org> | ||
| 6 | |||
| 7 | * process.c (send_process): Free composition data. | ||
| 8 | |||
| 9 | * fileio.c (Finsert_file_contents): Free composition data. | ||
| 10 | |||
| 11 | * coding.c (code_convert_region): Don't skip ASCIIs if there are | ||
| 12 | compositions to encode. | ||
| 13 | (encode_coding_string): Likewise. Free composition data. | ||
| 14 | |||
| 15 | 2004-09-30 Florian Weimer <fw@deneb.enyo.de> (tiny change) | ||
| 16 | |||
| 17 | * coding.c (code_convert_region): Free composition data. | ||
| 18 | |||
| 1 | 2004-09-29 Kim F. Storm <storm@cua.dk> | 19 | 2004-09-29 Kim F. Storm <storm@cua.dk> |
| 2 | 20 | ||
| 3 | * fringe.c: Remove limit on number of bitmaps. | 21 | * fringe.c: Remove limit on number of bitmaps. |
diff --git a/src/fileio.c b/src/fileio.c index a8fa5bfef0d..1da60020e12 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -5634,6 +5634,9 @@ auto_save_1 () | |||
| 5634 | && stat (SDATA (current_buffer->filename), &st) >= 0) | 5634 | && stat (SDATA (current_buffer->filename), &st) >= 0) |
| 5635 | /* But make sure we can overwrite it later! */ | 5635 | /* But make sure we can overwrite it later! */ |
| 5636 | auto_save_mode_bits = st.st_mode | 0600; | 5636 | auto_save_mode_bits = st.st_mode | 0600; |
| 5637 | else if (! NILP (current_buffer->filename)) | ||
| 5638 | /* Remote files don't cooperate with stat. */ | ||
| 5639 | auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 0600; | ||
| 5637 | else | 5640 | else |
| 5638 | auto_save_mode_bits = 0666; | 5641 | auto_save_mode_bits = 0666; |
| 5639 | 5642 | ||