aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-09-11 14:42:07 +0200
committerJoakim Verona2013-09-11 14:42:07 +0200
commit0b086327ccb086dadf737286ffd54d5418e181c4 (patch)
tree2d16a9521fc5b00ca2eedfa8870ba80944ac34cb /src/ChangeLog
parent41390a42c5c18af8a112d7481875fe25e42b659c (diff)
parentfeeff482d80b9f37d083497b2d3a9fec8bc58757 (diff)
downloademacs-0b086327ccb086dadf737286ffd54d5418e181c4.tar.gz
emacs-0b086327ccb086dadf737286ffd54d5418e181c4.zip
merge from trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6e527b996dd..db08fe6aae8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * insdel.c (insert_from_buffer_1): Don't mark buffer as modified when
4 insert-buffer-substring an empty string.
5
12013-09-11 Paul Eggert <eggert@cs.ucla.edu> 62013-09-11 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out, 8 * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out,