aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-09-28 09:02:31 -0700
committerGlenn Morris2012-09-28 09:02:31 -0700
commite61d39cddfd015032a6419ce75c36ecdf1e9fe9f (patch)
treef1f941a206a079e9a7b2813dc2f7479c2ba05495 /src/ChangeLog
parent3df749b0f8a97c8b8f18a34bce494fd9d4fe987f (diff)
parent147c0425024ce9c1dbb7301300867d8563a6730a (diff)
downloademacs-e61d39cddfd015032a6419ce75c36ecdf1e9fe9f.tar.gz
emacs-e61d39cddfd015032a6419ce75c36ecdf1e9fe9f.zip
Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org
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 92ab8080c9d..c30c4ed955b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-09-28 Glenn Morris <rgm@gnu.org>
2
3 * eval.c (Frun_hook_with_args, Frun_hook_with_args_until_success)
4 (Frun_hook_with_args_until_failure): Doc fixes.
5
12012-09-28 Eli Zaretskii <eliz@gnu.org> 62012-09-28 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xdisp.c (syms_of_xdisp) <Qredisplay_internal>: Rename from 8 * xdisp.c (syms_of_xdisp) <Qredisplay_internal>: Rename from