diff options
| author | Paul Eggert | 2011-07-16 18:34:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-16 18:34:49 -0700 |
| commit | 8d576a545d08182fae5c7d705a53da2a84e0d85a (patch) | |
| tree | 4a63ae460c346b0a58d09b8f903ed442a1abb2d2 /src/ChangeLog | |
| parent | b1f367f797aa19047904e73a67e52f391c720e0d (diff) | |
| parent | c2216f8e3a2a17ba5b843f0329ce52c920a336b2 (diff) | |
| download | emacs-8d576a545d08182fae5c7d705a53da2a84e0d85a.tar.gz emacs-8d576a545d08182fae5c7d705a53da2a84e0d85a.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9e46b7d3318..1dcf39498f3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -242,6 +242,14 @@ | |||
| 242 | Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally | 242 | Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally |
| 243 | well either way, and we prefer signed to unsigned. | 243 | well either way, and we prefer signed to unsigned. |
| 244 | 244 | ||
| 245 | 2011-07-17 Paul Eggert <eggert@cs.ucla.edu> | ||
| 246 | |||
| 247 | * fileio.c (Fcopy_file): Pacify gcc re fchown. (Bug#9002) | ||
| 248 | This works around a problem with the previous change to Fcopy_file. | ||
| 249 | Recent glibc declares fchown with __attribute__((warn_unused_result)), | ||
| 250 | and without this change, GCC might complain about discarding | ||
| 251 | fchown's return value. | ||
| 252 | |||
| 245 | 2011-07-16 Juanma Barranquero <lekktu@gmail.com> | 253 | 2011-07-16 Juanma Barranquero <lekktu@gmail.com> |
| 246 | 254 | ||
| 247 | * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059). | 255 | * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059). |