aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-09-28 16:10:41 +0200
committerEli Zaretskii2012-09-28 16:10:41 +0200
commit404043ea8821e8902190e2e7d1140224c3ae33ea (patch)
tree78101f5a1940c0ff4b63959b9193ed559d82336f /src
parent7f457c067de84a0973883ef7889e648fbb17b055 (diff)
downloademacs-404043ea8821e8902190e2e7d1140224c3ae33ea.tar.gz
emacs-404043ea8821e8902190e2e7d1140224c3ae33ea.zip
Rename "Automatic Redisplay" entry in Lisp backtrace.
src/xdisp.c (syms_of_xdisp) <Qredisplay_internal>: Rename from Qautomatic_redisplay and change the symbol name. All users changed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d6a6d91b75a..92ab8080c9d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-09-28 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (syms_of_xdisp) <Qredisplay_internal>: Rename from
4 Qautomatic_redisplay and change the symbol name. All users changed.
5
12012-09-28 Tomohiro Matsuyama <tomo@cx4a.org> 62012-09-28 Tomohiro Matsuyama <tomo@cx4a.org>
2 7
3 * profiler.c (sigprof_handler): Fix race condition. 8 * profiler.c (sigprof_handler): Fix race condition.
diff --git a/src/xdisp.c b/src/xdisp.c
index fa6460d7be2..701ae22cd06 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -347,7 +347,7 @@ static Lisp_Object Qfontification_functions;
347 347
348static Lisp_Object Qwrap_prefix; 348static Lisp_Object Qwrap_prefix;
349static Lisp_Object Qline_prefix; 349static Lisp_Object Qline_prefix;
350static Lisp_Object Qautomatic_redisplay; 350static Lisp_Object Qredisplay_internal;
351 351
352/* Non-nil means don't actually do any redisplay. */ 352/* Non-nil means don't actually do any redisplay. */
353 353
@@ -12975,8 +12975,8 @@ redisplay_internal (void)
12975 12975
12976 /* Record this function, so it appears on the profiler's backtraces. */ 12976 /* Record this function, so it appears on the profiler's backtraces. */
12977 backtrace.next = backtrace_list; 12977 backtrace.next = backtrace_list;
12978 backtrace.function = &Qautomatic_redisplay; 12978 backtrace.function = &Qredisplay_internal;
12979 backtrace.args = &Qautomatic_redisplay; 12979 backtrace.args = &Qredisplay_internal;
12980 backtrace.nargs = 0; 12980 backtrace.nargs = 0;
12981 backtrace.debug_on_exit = 0; 12981 backtrace.debug_on_exit = 0;
12982 backtrace_list = &backtrace; 12982 backtrace_list = &backtrace;
@@ -28694,7 +28694,7 @@ syms_of_xdisp (void)
28694 staticpro (&Vmessage_stack); 28694 staticpro (&Vmessage_stack);
28695 28695
28696 DEFSYM (Qinhibit_redisplay, "inhibit-redisplay"); 28696 DEFSYM (Qinhibit_redisplay, "inhibit-redisplay");
28697 DEFSYM (Qautomatic_redisplay, "Automatic Redisplay"); 28697 DEFSYM (Qredisplay_internal, "redisplay_internal (C function)");
28698 28698
28699 message_dolog_marker1 = Fmake_marker (); 28699 message_dolog_marker1 = Fmake_marker ();
28700 staticpro (&message_dolog_marker1); 28700 staticpro (&message_dolog_marker1);