diff options
| author | Martin Rudalics | 2011-06-10 15:18:13 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2011-06-10 15:18:13 +0200 |
| commit | 2c8e37d4977b0474872c51ea2700bf73c7436d3c (patch) | |
| tree | bd4e21689a28e310ac983b098a8a63fd6236dbc9 /src | |
| parent | 440a42e34c0e31a793cf9b667bc95023e8f987ef (diff) | |
| download | emacs-2c8e37d4977b0474872c51ea2700bf73c7436d3c.tar.gz emacs-2c8e37d4977b0474872c51ea2700bf73c7436d3c.zip | |
Some more window.h fixes missing in 2011-06-10T06:55:18Z!rudalics@gmx.at.
* window.h (resize_proportionally, orig_total_lines)
(orig_top_line): Remove from window structure.
(set_window_height, set_window_width, change_window_heights)
(Fdelete_window): Remove prototypes.
(resize_frame_windows): Remove duplicate declaration.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/window.h | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 93e64744d58..93aaef013fb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2011-06-10 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.h (resize_proportionally, orig_total_lines) | ||
| 4 | (orig_top_line): Remove from window structure. | ||
| 5 | (set_window_height, set_window_width, change_window_heights) | ||
| 6 | (Fdelete_window): Remove prototypes. | ||
| 7 | (resize_frame_windows): Remove duplicate declaration. | ||
| 8 | |||
| 1 | 2011-06-10 Eli Zaretskii <eliz@gnu.org> | 9 | 2011-06-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 10 | ||
| 3 | * window.h (resize_frame_windows, resize_window_check) | 11 | * window.h (resize_frame_windows, resize_window_check) |
diff --git a/src/window.h b/src/window.h index 158203dc911..236464775d3 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -261,12 +261,6 @@ struct window | |||
| 261 | /* If redisplay in this window goes beyond this buffer position, | 261 | /* If redisplay in this window goes beyond this buffer position, |
| 262 | must run the redisplay-end-trigger-hook. */ | 262 | must run the redisplay-end-trigger-hook. */ |
| 263 | Lisp_Object redisplay_end_trigger; | 263 | Lisp_Object redisplay_end_trigger; |
| 264 | /* Non-nil means resizing windows will attempt to resize this window | ||
| 265 | proportionally. */ | ||
| 266 | Lisp_Object resize_proportionally; | ||
| 267 | |||
| 268 | /* Original window height and top before mini-window was enlarged. */ | ||
| 269 | Lisp_Object orig_total_lines, orig_top_line; | ||
| 270 | 264 | ||
| 271 | /* Non-nil means deleting or resizing this window distributes | 265 | /* Non-nil means deleting or resizing this window distributes |
| 272 | space among all windows in the same combination. */ | 266 | space among all windows in the same combination. */ |
| @@ -833,9 +827,6 @@ extern Lisp_Object make_window (void); | |||
| 833 | extern Lisp_Object window_from_coordinates (struct frame *, int, int, | 827 | extern Lisp_Object window_from_coordinates (struct frame *, int, int, |
| 834 | enum window_part *, int); | 828 | enum window_part *, int); |
| 835 | EXFUN (Fwindow_dedicated_p, 1); | 829 | EXFUN (Fwindow_dedicated_p, 1); |
| 836 | extern void set_window_height (Lisp_Object, int, int); | ||
| 837 | extern void set_window_width (Lisp_Object, int, int); | ||
| 838 | extern void change_window_heights (Lisp_Object, int); | ||
| 839 | extern void delete_all_subwindows (Lisp_Object); | 830 | extern void delete_all_subwindows (Lisp_Object); |
| 840 | extern void freeze_window_starts (struct frame *, int); | 831 | extern void freeze_window_starts (struct frame *, int); |
| 841 | extern void grow_mini_window (struct window *, int); | 832 | extern void grow_mini_window (struct window *, int); |
| @@ -918,7 +909,6 @@ EXFUN (Fselected_window, 0); | |||
| 918 | EXFUN (Fframe_root_window, 1); | 909 | EXFUN (Fframe_root_window, 1); |
| 919 | EXFUN (Fframe_first_window, 1); | 910 | EXFUN (Fframe_first_window, 1); |
| 920 | EXFUN (Fset_frame_selected_window, 3); | 911 | EXFUN (Fset_frame_selected_window, 3); |
| 921 | EXFUN (Fdelete_window, 1); | ||
| 922 | EXFUN (Fset_window_configuration, 1); | 912 | EXFUN (Fset_window_configuration, 1); |
| 923 | EXFUN (Fcurrent_window_configuration, 1); | 913 | EXFUN (Fcurrent_window_configuration, 1); |
| 924 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); | 914 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); |
| @@ -938,7 +928,6 @@ extern int resize_window_check (struct window *, int); | |||
| 938 | extern Lisp_Object delete_deletable_window (Lisp_Object); | 928 | extern Lisp_Object delete_deletable_window (Lisp_Object); |
| 939 | extern Lisp_Object resize_root_window (Lisp_Object, Lisp_Object, Lisp_Object, | 929 | extern Lisp_Object resize_root_window (Lisp_Object, Lisp_Object, Lisp_Object, |
| 940 | Lisp_Object); | 930 | Lisp_Object); |
| 941 | extern void resize_frame_windows (struct frame *, int, int); | ||
| 942 | 931 | ||
| 943 | 932 | ||
| 944 | #endif /* not WINDOW_H_INCLUDED */ | 933 | #endif /* not WINDOW_H_INCLUDED */ |