diff options
| author | Glenn Morris | 2013-03-04 19:59:35 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-03-04 19:59:35 -0800 |
| commit | 28b6b84d4e91cf39c85f194c29b8e044ae6bac87 (patch) | |
| tree | c66b211afe8fbeda52c5cfe68bacf1bbb3d6243e /src/ChangeLog | |
| parent | 3bfc46eb53ed50ec32711b5595cffc5b7b543249 (diff) | |
| parent | 408ffa0fef7a4e9a91a2b864700d5ced8783dd59 (diff) | |
| download | emacs-28b6b84d4e91cf39c85f194c29b8e044ae6bac87.tar.gz emacs-28b6b84d4e91cf39c85f194c29b8e044ae6bac87.zip | |
Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz@gnu.org
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b511550624f..23071b03bee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2013-03-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix a build failure on OpenBSD 4.x and MirBSD. | ||
| 4 | * sysdep.c (KERN_PROC, kinfo_proc) | ||
| 5 | [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]: | ||
| 6 | Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD. | ||
| 7 | list-system-processes still returns nil, but at least it doesn't crash. | ||
| 8 | Problem reported by Nelson H. F. Beebe in | ||
| 9 | <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>. | ||
| 10 | |||
| 1 | 2013-03-05 Dmitry Antipov <dmantipov@yandex.ru> | 11 | 2013-03-05 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 12 | ||
| 3 | * composite.c (get_composition_id, fill_gstring_header): | 13 | * composite.c (get_composition_id, fill_gstring_header): |