diff options
| author | Paul Eggert | 2011-07-16 18:33:46 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-16 18:33:46 -0700 |
| commit | c2216f8e3a2a17ba5b843f0329ce52c920a336b2 (patch) | |
| tree | a61b92b3e9ba0360eaf402adf7936e1acf2fd2a9 /src/ChangeLog | |
| parent | 4f8a4547454e24304b4182fbf4ae4b34a7bdc92b (diff) | |
| parent | 9e381cdd9641fa07e9caa09b783db8d5f84f1651 (diff) | |
| download | emacs-c2216f8e3a2a17ba5b843f0329ce52c920a336b2.tar.gz emacs-c2216f8e3a2a17ba5b843f0329ce52c920a336b2.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 b3d9eca469e..506396e9583 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -197,6 +197,14 @@ | |||
| 197 | Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally | 197 | Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally |
| 198 | well either way, and we prefer signed to unsigned. | 198 | well either way, and we prefer signed to unsigned. |
| 199 | 199 | ||
| 200 | 2011-07-17 Paul Eggert <eggert@cs.ucla.edu> | ||
| 201 | |||
| 202 | * fileio.c (Fcopy_file): Pacify gcc re fchown. (Bug#9002) | ||
| 203 | This works around a problem with the previous change to Fcopy_file. | ||
| 204 | Recent glibc declares fchown with __attribute__((warn_unused_result)), | ||
| 205 | and without this change, GCC might complain about discarding | ||
| 206 | fchown's return value. | ||
| 207 | |||
| 200 | 2011-07-16 Juanma Barranquero <lekktu@gmail.com> | 208 | 2011-07-16 Juanma Barranquero <lekktu@gmail.com> |
| 201 | 209 | ||
| 202 | * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059). | 210 | * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059). |