aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-09 16:58:10 -0800
committerPaul Eggert2011-03-09 16:58:10 -0800
commitf78faa98a289e2acfa6b448b5faf66331c346224 (patch)
treedfe00efe4a1b0dd90c228f51082b0370ae1c1d88
parent2a8fade06259290024cd7fe98fdeb8fd9709c90f (diff)
downloademacs-f78faa98a289e2acfa6b448b5faf66331c346224.tar.gz
emacs-f78faa98a289e2acfa6b448b5faf66331c346224.zip
* xfns.c (x_decode_color, x_set_name, x_window): Now static.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 13f1715d3ae..b88e07e8356 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-03-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xfns.c (x_decode_color, x_set_name, x_window): Now static.
4
12011-03-09 Paul Eggert <eggert@cs.ucla.edu> 52011-03-09 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * xterm.h (x_mouse_leave): New decl. 7 * xterm.h (x_mouse_leave): New decl.
diff --git a/src/xfns.c b/src/xfns.c
index deb0e192a54..d1907567737 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -648,7 +648,7 @@ x_defined_color (struct frame *f, const char *color_name,
648 is a monochrome frame, return MONO_COLOR regardless of what ARG says. 648 is a monochrome frame, return MONO_COLOR regardless of what ARG says.
649 Signal an error if color can't be allocated. */ 649 Signal an error if color can't be allocated. */
650 650
651int 651static int
652x_decode_color (FRAME_PTR f, Lisp_Object color_name, int mono_color) 652x_decode_color (FRAME_PTR f, Lisp_Object color_name, int mono_color)
653{ 653{
654 XColor cdef; 654 XColor cdef;
@@ -1635,7 +1635,7 @@ x_set_name_internal (FRAME_PTR f, Lisp_Object name)
1635 suggesting a new name, which lisp code should override; if 1635 suggesting a new name, which lisp code should override; if
1636 F->explicit_name is set, ignore the new name; otherwise, set it. */ 1636 F->explicit_name is set, ignore the new name; otherwise, set it. */
1637 1637
1638void 1638static void
1639x_set_name (struct frame *f, Lisp_Object name, int explicit) 1639x_set_name (struct frame *f, Lisp_Object name, int explicit)
1640{ 1640{
1641 /* Make sure that requests from lisp code override requests from 1641 /* Make sure that requests from lisp code override requests from
@@ -2620,7 +2620,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
2620 2620
2621#else /* not USE_X_TOOLKIT */ 2621#else /* not USE_X_TOOLKIT */
2622#ifdef USE_GTK 2622#ifdef USE_GTK
2623void 2623static void
2624x_window (FRAME_PTR f) 2624x_window (FRAME_PTR f)
2625{ 2625{
2626 if (! xg_create_frame_widgets (f)) 2626 if (! xg_create_frame_widgets (f))
@@ -2660,7 +2660,7 @@ x_window (FRAME_PTR f)
2660#else /*! USE_GTK */ 2660#else /*! USE_GTK */
2661/* Create and set up the X window for frame F. */ 2661/* Create and set up the X window for frame F. */
2662 2662
2663void 2663static void
2664x_window (struct frame *f) 2664x_window (struct frame *f)
2665{ 2665{
2666 XClassHint class_hints; 2666 XClassHint class_hints;