(Fset_window_buffer): Add type of `keep_margins' argument.

(Fset_window_fringes, Fset_window_scroll_bars): Declare before use.

diff --git a/src/ChangeLog b/src/ChangeLog
index c480621fc324132020402ceb25e775d9be89df54..3705888041ffbe98ddc517ef42b45cd4e93934db 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,36 @@
+2003-05-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * window.c (Fset_window_buffer): Add type of `keep_margins'.
+       (Fset_window_fringes, Fset_window_scroll_bars): Declare before use.
+
+       * window.h (window_box_text_cols): Declare.
+
+       * xdisp.c (window_text_bottom_y, draw_row_fringe_bitmaps)
+       (x_draw_vertical_border): Remove unused var `f'.
+
+       * xfaces.c (build_scalable_font_name): Remove `unused var
+       pixel_size' warning.
+
+       * xfns.c (png_load): Remove `unused vars intent, image_gamma' warning.
+
+       * unexelf.c (unexec): Remove `unused var n' warning.
+
+       * strftime.c (my_strftime_localtime_r): Remove `defined but
+       unused' warning.
+
+       * process.c (allocate_pty): Remove `unused var stb' and
+       `cp might be used uninitialized' warnings.
+
+       * dispnew.c (mode_line_string): Remove unused var `f'.
+
+       * coding.c (find_safe_codings): Remove unused var `i'.
+
+       * bytecode.c (Fbyte_code): Remove `unused val' warning.
+
+       * buffer.c (Fkill_buffer): Remove unused var `list'.
+
+       * alloc.c (Fgarbage_collect): Remove `unused var tail' warning.
+
 2003-05-25  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * frame.c (make_frame): Condition want_fullscreen with

diff --git a/src/window.c b/src/window.c
index c07c35b8685c66084cafb6cb8b6cdceb4cb426e7..81b089017e08db2c8eac2af2ad65d1135e959130 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2707,6 +2707,8 @@ Fset_window_buffer_unwind (obuf)
   return Qnil;
 }
 
+EXFUN (Fset_window_fringes, 4);
+EXFUN (Fset_window_scroll_bars, 4);
 
 /* Make WINDOW display BUFFER as its contents.  RUN_HOOKS_P non-zero
    means it's allowed to run hooks.  See make_frame for a case where
@@ -2805,7 +2807,7 @@ display margins, fringe widths, and scroll bar settings are maintained;
 the default is to reset these from BUFFER's local settings or the frame
 defaults.  */)
      (window, buffer, keep_margins)
-     register Lisp_Object window, buffer;
+     register Lisp_Object window, buffer, keep_margins;
 {
   register Lisp_Object tem;
   register struct window *w = decode_window (window);