aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-09-07 23:00:58 -0700
committerGlenn Morris2014-09-07 23:00:58 -0700
commitc04714f7c87956eb49e803d69290793f15fdaa90 (patch)
treebf673719000a4e8d20178433870c1759d1759020 /src/ChangeLog
parent4612d1eab721a1010312382d1048c8b3a67b18fa (diff)
parent6e82d877a4a59feb4390baeb2ccc57e7cd03593d (diff)
downloademacs-c04714f7c87956eb49e803d69290793f15fdaa90.tar.gz
emacs-c04714f7c87956eb49e803d69290793f15fdaa90.zip
Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu
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 2654abd32d4..4e01e155c2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
12014-09-08 Eli Zaretskii <eliz@gnu.org>
2
3 * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero,
4 always make sure the marginal areas of the row are in sync with
5 what the window wants. (Bug#18419)
6
7 * data.c (set_internal): Use assq_no_quit, not Fassq, to find an
8 existing binding of a variable, to avoid silently aborting
9 commands that use specbind. (Bug#18331)
10
12014-09-07 Paul Eggert <eggert@cs.ucla.edu> 112014-09-07 Paul Eggert <eggert@cs.ucla.edu>
2 12
3 Fix bug uncovered by changing alloca to auto buffer (Bug#18410). 13 Fix bug uncovered by changing alloca to auto buffer (Bug#18410).