aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-09-10 18:20:56 -0700
committerPaul Eggert2012-09-10 18:20:56 -0700
commit6fda35f2b3e3ce3c7dcc05f230f60c51c4c42e60 (patch)
treef7283ff6939d12d5bdca14348d1b612ee896434b /src
parent16130a58689c3e24a159dbbd7cab000a28511cc7 (diff)
downloademacs-6fda35f2b3e3ce3c7dcc05f230f60c51c4c42e60.tar.gz
emacs-6fda35f2b3e3ce3c7dcc05f230f60c51c4c42e60.zip
* xdisp.c (Qinhibit_debug_on_message): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 412321563ba..4eda17da3a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-09-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xdisp.c (Qinhibit_debug_on_message): Now static.
4
12012-09-10 Jan Djärv <jan.h.d@swipnet.se> 52012-09-10 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.m (ns_update_begin): Set clip path to whole view by using 7 * nsterm.m (ns_update_begin): Set clip path to whole view by using
diff --git a/src/xdisp.c b/src/xdisp.c
index bec9ec91d2f..a7913768d8a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -364,7 +364,7 @@ static Lisp_Object Qslice;
364Lisp_Object Qcenter; 364Lisp_Object Qcenter;
365static Lisp_Object Qmargin, Qpointer; 365static Lisp_Object Qmargin, Qpointer;
366static Lisp_Object Qline_height; 366static Lisp_Object Qline_height;
367Lisp_Object Qinhibit_debug_on_message; 367static Lisp_Object Qinhibit_debug_on_message;
368 368
369/* These setters are used only in this file, so they can be private. */ 369/* These setters are used only in this file, so they can be private. */
370static inline void 370static inline void