diff options
| author | Stefan Monnier | 2003-05-25 17:49:55 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2003-05-25 17:49:55 +0000 |
| commit | 56613f06dc32f78043cae1d4dbb5a59cc2b98b62 (patch) | |
| tree | 353b31cfb97ed25b1e0413c99d11c2d34fe3e53b /src | |
| parent | fccd208dec664d555d3f17d1f403f64d89dfd773 (diff) | |
| download | emacs-56613f06dc32f78043cae1d4dbb5a59cc2b98b62.tar.gz emacs-56613f06dc32f78043cae1d4dbb5a59cc2b98b62.zip | |
(Fset_window_buffer): Add type of `keep_margins' argument.
(Fset_window_fringes, Fset_window_scroll_bars): Declare before use.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 33 | ||||
| -rw-r--r-- | src/window.c | 4 |
2 files changed, 36 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c480621fc32..3705888041f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,36 @@ | |||
| 1 | 2003-05-25 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * window.c (Fset_window_buffer): Add type of `keep_margins'. | ||
| 4 | (Fset_window_fringes, Fset_window_scroll_bars): Declare before use. | ||
| 5 | |||
| 6 | * window.h (window_box_text_cols): Declare. | ||
| 7 | |||
| 8 | * xdisp.c (window_text_bottom_y, draw_row_fringe_bitmaps) | ||
| 9 | (x_draw_vertical_border): Remove unused var `f'. | ||
| 10 | |||
| 11 | * xfaces.c (build_scalable_font_name): Remove `unused var | ||
| 12 | pixel_size' warning. | ||
| 13 | |||
| 14 | * xfns.c (png_load): Remove `unused vars intent, image_gamma' warning. | ||
| 15 | |||
| 16 | * unexelf.c (unexec): Remove `unused var n' warning. | ||
| 17 | |||
| 18 | * strftime.c (my_strftime_localtime_r): Remove `defined but | ||
| 19 | unused' warning. | ||
| 20 | |||
| 21 | * process.c (allocate_pty): Remove `unused var stb' and | ||
| 22 | `cp might be used uninitialized' warnings. | ||
| 23 | |||
| 24 | * dispnew.c (mode_line_string): Remove unused var `f'. | ||
| 25 | |||
| 26 | * coding.c (find_safe_codings): Remove unused var `i'. | ||
| 27 | |||
| 28 | * bytecode.c (Fbyte_code): Remove `unused val' warning. | ||
| 29 | |||
| 30 | * buffer.c (Fkill_buffer): Remove unused var `list'. | ||
| 31 | |||
| 32 | * alloc.c (Fgarbage_collect): Remove `unused var tail' warning. | ||
| 33 | |||
| 1 | 2003-05-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 34 | 2003-05-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 35 | ||
| 3 | * frame.c (make_frame): Condition want_fullscreen with | 36 | * frame.c (make_frame): Condition want_fullscreen with |
diff --git a/src/window.c b/src/window.c index c07c35b8685..81b089017e0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -2707,6 +2707,8 @@ Fset_window_buffer_unwind (obuf) | |||
| 2707 | return Qnil; | 2707 | return Qnil; |
| 2708 | } | 2708 | } |
| 2709 | 2709 | ||
| 2710 | EXFUN (Fset_window_fringes, 4); | ||
| 2711 | EXFUN (Fset_window_scroll_bars, 4); | ||
| 2710 | 2712 | ||
| 2711 | /* Make WINDOW display BUFFER as its contents. RUN_HOOKS_P non-zero | 2713 | /* Make WINDOW display BUFFER as its contents. RUN_HOOKS_P non-zero |
| 2712 | means it's allowed to run hooks. See make_frame for a case where | 2714 | 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; | |||
| 2805 | the default is to reset these from BUFFER's local settings or the frame | 2807 | the default is to reset these from BUFFER's local settings or the frame |
| 2806 | defaults. */) | 2808 | defaults. */) |
| 2807 | (window, buffer, keep_margins) | 2809 | (window, buffer, keep_margins) |
| 2808 | register Lisp_Object window, buffer; | 2810 | register Lisp_Object window, buffer, keep_margins; |
| 2809 | { | 2811 | { |
| 2810 | register Lisp_Object tem; | 2812 | register Lisp_Object tem; |
| 2811 | register struct window *w = decode_window (window); | 2813 | register struct window *w = decode_window (window); |