aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2011-01-24 19:47:47 -0800
committerGlenn Morris2011-01-24 19:47:47 -0800
commit06d8ace51597cd41e110560a56a1abeb6cce23d6 (patch)
treee893bab169f27821637fc07e3cd2414b4b9b7b68 /src/ChangeLog
parentc5ecc7690d4afafb42049634d64abd781ff76642 (diff)
parent0d19d4feaa653a315853716e64bbaddb210a26ca (diff)
downloademacs-06d8ace51597cd41e110560a56a1abeb6cce23d6.tar.gz
emacs-06d8ace51597cd41e110560a56a1abeb6cce23d6.zip
Merge from emacs-23.
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 134e289681c..3776682c692 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
12011-01-25 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * xdisp.c (handle_fontified_prop): Be careful with font-lock changing
4 the buffer's point-max (bug#7876).
5
62011-01-25 Chong Yidong <cyd@stupidchicken.com>
7
8 * lisp.h (XPNTR): Obey DATA_SEG_BITS in all non-USE_LSB_TAG cases.
9 Remove unused case (Bug#6811).
10
12011-01-23 Jan Djärv <jan.h.d@swipnet.se> 112011-01-23 Jan Djärv <jan.h.d@swipnet.se>
2 12
3 * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to 13 * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to