From: Kenichi Handa Date: Wed, 20 Mar 2013 08:08:34 +0000 (+0900) Subject: merge trunk X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~530 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47077837aff40030430e3d1d0522fee5db62ee1e;p=emacs.git merge trunk --- 47077837aff40030430e3d1d0522fee5db62ee1e diff --cc src/ChangeLog index 6de0212109a,a0a0cd81ed2..2779e5a6ea8 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,9 -1,14 +1,20 @@@ +2013-03-20 Kenichi Handa + + * coding.c (syms_of_coding): Initialize disable_ascii_optimization + to 1 (temporary workaround until a bug related to ASCII + optimization is fixed). + + 2013-03-19 Dmitry Antipov + + * window.c (Fwindow_combination_limit, Fset_window_combination_limit): + Signal error if window is not internal. Adjust docstring. + (delete_all_child_windows): Use combination_limit to save the buffer. + (Fset_window_configuration): Adjust accordingly. + * print.c (syms_of_print): Initialize debugging output not here... + (init_print_once): ...but in a new function here. + * lisp.h (init_print_once): Add prototype. + * emacs.c (main): Add call to init_print_once. Adjust comments. + 2013-03-18 Dmitry Antipov * window.c (window_resize_check, window_resize_apply)