diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-01 09:09:18 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-01 09:09:18 -0800 |
| commit | 75b09539a4b4e62818d65cb0773587d8a2ac615f (patch) | |
| tree | d5cdb6c58ff12f0f98a81a941014698ffaba56a6 | |
| parent | 1f6e1bb00084afd6598e83edb1697fef3379fec2 (diff) | |
| download | emacs-75b09539a4b4e62818d65cb0773587d8a2ac615f.tar.gz emacs-75b09539a4b4e62818d65cb0773587d8a2ac615f.tar.bz2 emacs-75b09539a4b4e62818d65cb0773587d8a2ac615f.zip | |
Fix minor problems found by static checking.
* dispextern.h, xdisp.c (x_draw_bottom_divider): Now static.
* frame.c (set_frame_param) [!HAVE_NTGUI]: Remove.
* xdisp.c (Ftool_bar_height) [USE_GTK || HAVE_NS]: Now const function.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/dispextern.h | 1 | ||||
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 36c379c56dc..fc9e8431146 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-12-01 Paul Eggert <eggert@cs.ucla.edu> + + Fix minor problems found by static checking. + * dispextern.h, xdisp.c (x_draw_bottom_divider): Now static. + * frame.c (set_frame_param) [!HAVE_NTGUI]: Remove. + * xdisp.c (Ftool_bar_height) [USE_GTK || HAVE_NS]: Now const function. + 2013-12-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * image.c (imagemagick_compute_animated_image): Don't crash if we diff --git a/src/dispextern.h b/src/dispextern.h index fb2053476b0..977e2f8c66c 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3255,7 +3255,6 @@ extern void x_update_cursor (struct frame *, bool); extern void x_clear_cursor (struct window *); extern void x_draw_vertical_border (struct window *w); extern void x_draw_right_divider (struct window *w); -extern void x_draw_bottom_divider (struct window *w); extern int get_glyph_string_clip_rects (struct glyph_string *, NativeRectangle *, int); diff --git a/src/frame.c b/src/frame.c index df41822f916..03bdf696c47 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2027,6 +2027,7 @@ set_term_frame_name (struct frame *f, Lisp_Object name) update_mode_lines = 16; } +#ifdef HAVE_NTGUI void set_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) { @@ -2038,6 +2039,7 @@ set_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) else Fsetcdr (old_alist_elt, val); } +#endif void store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) diff --git a/src/xdisp.c b/src/xdisp.c index 35db8a0d8ad..e192ed3fd6b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -970,6 +970,7 @@ static int in_ellipses_for_invisible_text_p (struct display_pos *, static void x_consider_frame_title (Lisp_Object); static void update_tool_bar (struct frame *, int); static int redisplay_tool_bar (struct frame *); +static void x_draw_bottom_divider (struct window *w); static void notice_overwritten_cursor (struct window *, enum glyph_row_area, int, int, int, int); @@ -12097,6 +12098,7 @@ tool_bar_height (struct frame *f, int *n_rows, bool pixelwise) #endif /* !USE_GTK && !HAVE_NS */ #if defined USE_GTK || defined HAVE_NS +EXFUN (Ftool_bar_height, 2) ATTRIBUTE_CONST; EXFUN (Ftool_bar_lines_needed, 1) ATTRIBUTE_CONST; #endif @@ -29118,7 +29120,7 @@ x_draw_right_divider (struct window *w) } } -void +static void x_draw_bottom_divider (struct window *w) { struct frame *f = XFRAME (WINDOW_FRAME (w)); |