aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-01-19 15:58:00 -0800
committerPaul Eggert2011-01-19 15:58:00 -0800
commit38ec24bf555387224ba36a7ead82d6e4d89018ed (patch)
treeed9a1478d3050f006639ba2bb329d7ff69e43b49 /src/ChangeLog
parent0813c96eb2f6af9d6a392243b0d669d38467f23c (diff)
parente1ef0dac0866570df62f96fb004de896f6e82397 (diff)
downloademacs-38ec24bf555387224ba36a7ead82d6e4d89018ed.tar.gz
emacs-38ec24bf555387224ba36a7ead82d6e4d89018ed.zip
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 79cc893eaae..735b6e4789e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
12011-01-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix X11 compilation failure.
4 * globals.h (struct emacs_globals): Document f_Vselection_alist.
5 * xselect.c (Vselection_alist): Remove declaration, moving its
6 documentation to globals.h. This fixes a compilation failure
7 induced by the earlier change to globals.h today.
8
12011-01-19 Jan Djärv <jan.h.d@swipnet.se> 92011-01-19 Jan Djärv <jan.h.d@swipnet.se>
2 10
3 * unexmacosx.c: Include config.h before unistd.h (Bug#7859). 11 * unexmacosx.c: Include config.h before unistd.h (Bug#7859).