From: Paul Eggert Date: Fri, 1 Aug 2014 15:12:01 +0000 (-0700) Subject: Make functions static that no longer need to be extern. X-Git-Tag: emacs-25.0.90~2635^2~679^2~546 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ee7618cf19fc8334e8fccdcf2eff01786426a64;p=emacs.git Make functions static that no longer need to be extern. * frame.c, frame.h (set_menu_bar_lines): * keyboard.c (Qleftmost, Qrightmost): * xfns.c, frame.h, menu.h (x_set_menu_bar_lines, x_set_tool_bar_lines) (x_set_internal_border_width): Now static. --- diff --git a/src/ChangeLog b/src/ChangeLog index c28f8a607aa..d9f974cce5d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2014-08-01 Paul Eggert + + Make functions static that no longer need to be extern. + * frame.c, frame.h (set_menu_bar_lines): + * keyboard.c (Qleftmost, Qrightmost): + * xfns.c, frame.h, menu.h (x_set_menu_bar_lines, x_set_tool_bar_lines) + (x_set_internal_border_width): + Now static. + 2014-08-01 Eli Zaretskii Fix display of R2L lines when the last character fits only partially. diff --git a/src/frame.c b/src/frame.c index 5dea57aece8..457024f3ca2 100644 --- a/src/frame.c +++ b/src/frame.c @@ -256,7 +256,7 @@ set_menu_bar_lines_1 (Lisp_Object window, int n) } } -void +static void set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; diff --git a/src/frame.h b/src/frame.h index 51597c4bcdb..5d45dbfb268 100644 --- a/src/frame.h +++ b/src/frame.h @@ -45,9 +45,9 @@ enum fullscreen_type FULLSCREEN_HEIGHT = 0x2, FULLSCREEN_BOTH = 0x3, /* Not a typo but means "width and height". */ FULLSCREEN_MAXIMIZED = 0x4, -#ifdef HAVE_NTGUI +#ifdef HAVE_NTGUI FULLSCREEN_WAIT = 0x8 -#endif +#endif }; #endif /* HAVE_WINDOW_SYSTEM */ @@ -161,7 +161,7 @@ struct frame /* Desired and current tool-bar items. */ Lisp_Object tool_bar_items; -#ifdef USE_GTK +#ifdef USE_GTK /* Where tool bar is, can be left, right, top or bottom. Except with GTK, the only supported position is `top'. */ Lisp_Object tool_bar_position; @@ -185,7 +185,7 @@ struct frame /* Number of elements in `menu_bar_vector' that have meaningful data. */ int menu_bar_items_used; -#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) +#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) /* A buffer to hold the frame's name. Since this is used by the window system toolkit, we can't use the Lisp string's pointer (`name', above) because it might get relocated. */ @@ -1089,7 +1089,6 @@ extern Lisp_Object Qtty_color_mode; extern Lisp_Object Qterminal; extern Lisp_Object Qnoelisp; -extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern struct frame *decode_window_system_frame (Lisp_Object); extern struct frame *decode_live_frame (Lisp_Object); extern struct frame *decode_any_frame (Lisp_Object); @@ -1108,7 +1107,7 @@ extern void check_window_system (struct frame *); extern void frame_make_pointer_invisible (struct frame *); extern void frame_make_pointer_visible (struct frame *); extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object); -extern bool frame_inhibit_resize (struct frame *, bool); +extern bool frame_inhibit_resize (struct frame *, bool); extern void adjust_frame_size (struct frame *, int, int, int, bool); extern Lisp_Object Vframe_list; @@ -1309,7 +1308,7 @@ extern Lisp_Object Vframe_list; ((height) \ - FRAME_TOP_MARGIN_HEIGHT (f) \ - FRAME_SCROLL_BAR_AREA_HEIGHT (f) \ - - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) + - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) /* Return the width/height reserved for the windows of frame F. */ #define FRAME_WINDOWS_WIDTH(f) \ @@ -1393,8 +1392,6 @@ extern void x_set_font_backend (struct frame *, Lisp_Object, Lisp_Object); extern void x_set_left_fringe (struct frame *, Lisp_Object, Lisp_Object); extern void x_set_right_fringe (struct frame *, Lisp_Object, Lisp_Object); extern void x_set_border_width (struct frame *, Lisp_Object, Lisp_Object); -extern void x_set_internal_border_width (struct frame *, Lisp_Object, - Lisp_Object); extern void x_set_right_divider_width (struct frame *, Lisp_Object, Lisp_Object); extern void x_set_bottom_divider_width (struct frame *, Lisp_Object, @@ -1429,7 +1426,6 @@ extern void x_make_frame_visible (struct frame *f); extern void x_make_frame_invisible (struct frame *f); extern void x_iconify_frame (struct frame *f); extern void x_set_frame_alpha (struct frame *f); -extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern void x_activate_menubar (struct frame *); extern void x_real_positions (struct frame *, int *, int *); extern void free_frame_menubar (struct frame *); diff --git a/src/keyboard.c b/src/keyboard.c index a684f18c756..81b68ab343c 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -5164,7 +5164,8 @@ static const char *const lispy_drag_n_drop_names[] = static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; static Lisp_Object Qbefore_handle, Qhorizontal_handle, Qafter_handle; Lisp_Object Qup, Qdown, Qtop, Qbottom; -Lisp_Object Qleft, Qright, Qleftmost, Qrightmost; +Lisp_Object Qleft, Qright; +static Lisp_Object Qleftmost, Qrightmost; static Lisp_Object Qend_scroll; static Lisp_Object Qratio; diff --git a/src/menu.h b/src/menu.h index 30a89bead26..4dd7f17dca6 100644 --- a/src/menu.h +++ b/src/menu.h @@ -34,10 +34,6 @@ enum { MENU_KBD_NAVIGATION = 0x4 }; -extern void x_set_menu_bar_lines (struct frame *f, - Lisp_Object value, - Lisp_Object oldval); - extern void init_menu_items (void); extern void finish_menu_items (void) ATTRIBUTE_CONST; extern void discard_menu_items (void); diff --git a/src/xfns.c b/src/xfns.c index 1787d0297e6..0c07d6cb03d 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -965,7 +965,7 @@ x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval) } -void +static void x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; @@ -1060,7 +1060,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) height of all windows on frame F to match the new tool bar height. The frame's height doesn't change. */ -void +static void x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; @@ -1149,7 +1149,7 @@ x_change_tool_bar_height (struct frame *f, int height) } -void +static void x_set_internal_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { int border; @@ -1172,7 +1172,7 @@ x_set_internal_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldva #ifdef USE_GTK xg_clear_under_internal_border (f); -#else +#else x_clear_under_internal_border (f); #endif }