[Emacs-diffs] trunk r115341: Fix minor problems found by static checking.

[Paul Eggert]

------------------------------------------------------------
revno: 115341
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-01 09:09:18 -0800
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispextern.h               
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-01 14:34:05 +0000
+++ b/src/ChangeLog     2013-12-01 17:09:18 +0000
@@ -1,3 +1,10 @@
+2013-12-01  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * image.c (imagemagick_compute_animated_image): Don't crash if we

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2013-11-30 09:25:31 +0000
+++ b/src/dispextern.h  2013-12-01 17:09:18 +0000
@@ -3255,7 +3255,6 @@
 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);

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-11-30 09:25:31 +0000
+++ b/src/frame.c       2013-12-01 17:09:18 +0000
@@ -2027,6 +2027,7 @@
   update_mode_lines = 16;
 }
 
+#ifdef HAVE_NTGUI
 void
 set_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val)
 {
@@ -2038,6 +2039,7 @@
   else
     Fsetcdr (old_alist_elt, val);
 }
+#endif
 
 void
 store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-11-30 16:25:51 +0000
+++ b/src/xdisp.c       2013-12-01 17:09:18 +0000
@@ -970,6 +970,7 @@
 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 @@
 #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 @@
     }
 }
 
-void
+static void
 x_draw_bottom_divider (struct window *w)
 {
   struct frame *f = XFRAME (WINDOW_FRAME (w));