diff options
| author | Richard M. Stallman | 2005-04-23 16:18:23 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-04-23 16:18:23 +0000 |
| commit | c0e7ccd393d14cd08efbe36fd96cd786cc1f31d3 (patch) | |
| tree | ec35850ec73d71657868858b31abe8a36f370219 /src | |
| parent | d379c5588908b60754d5c743582a5e142500cbf6 (diff) | |
| download | emacs-c0e7ccd393d14cd08efbe36fd96cd786cc1f31d3.tar.gz emacs-c0e7ccd393d14cd08efbe36fd96cd786cc1f31d3.zip | |
(window_size_fixed): Variable deleted.
(syms_of_window): Initialize window-size-fixed to nil.
But don't DEFVAR window_size_fixed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/window.c b/src/window.c index cdddc0da82e..5e6f923497b 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -79,10 +79,6 @@ static int foreach_window_1 P_ ((struct window *, | |||
| 79 | void *)); | 79 | void *)); |
| 80 | static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); | 80 | static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); |
| 81 | 81 | ||
| 82 | /* The value of `window-size-fixed'. */ | ||
| 83 | |||
| 84 | int window_size_fixed; | ||
| 85 | |||
| 86 | /* This is the window in which the terminal's cursor should | 82 | /* This is the window in which the terminal's cursor should |
| 87 | be left when nothing is being done with it. This must | 83 | be left when nothing is being done with it. This must |
| 88 | always be a leaf window, and its buffer is selected by | 84 | always be a leaf window, and its buffer is selected by |
| @@ -6669,6 +6665,7 @@ syms_of_window () | |||
| 6669 | { | 6665 | { |
| 6670 | Qwindow_size_fixed = intern ("window-size-fixed"); | 6666 | Qwindow_size_fixed = intern ("window-size-fixed"); |
| 6671 | staticpro (&Qwindow_size_fixed); | 6667 | staticpro (&Qwindow_size_fixed); |
| 6668 | Fset (Qwindow_size_fixed, Qnil); | ||
| 6672 | 6669 | ||
| 6673 | staticpro (&Qwindow_configuration_change_hook); | 6670 | staticpro (&Qwindow_configuration_change_hook); |
| 6674 | Qwindow_configuration_change_hook | 6671 | Qwindow_configuration_change_hook |
| @@ -6877,16 +6874,6 @@ scroll as specified. */); | |||
| 6877 | The selected frame is the one whose configuration has changed. */); | 6874 | The selected frame is the one whose configuration has changed. */); |
| 6878 | Vwindow_configuration_change_hook = Qnil; | 6875 | Vwindow_configuration_change_hook = Qnil; |
| 6879 | 6876 | ||
| 6880 | DEFVAR_BOOL ("window-size-fixed", &window_size_fixed, | ||
| 6881 | doc: /* Non-nil in a buffer means windows displaying the buffer are fixed-size. | ||
| 6882 | If the value is`height', then only the window's height is fixed. | ||
| 6883 | If the value is `width', then only the window's width is fixed. | ||
| 6884 | Any other non-nil value fixes both the width and the height. | ||
| 6885 | Emacs won't change the size of any window displaying that buffer, | ||
| 6886 | unless you explicitly change the size, or Emacs has no other choice. */); | ||
| 6887 | Fmake_variable_buffer_local (Qwindow_size_fixed); | ||
| 6888 | window_size_fixed = 0; | ||
| 6889 | |||
| 6890 | defsubr (&Sselected_window); | 6877 | defsubr (&Sselected_window); |
| 6891 | defsubr (&Sminibuffer_window); | 6878 | defsubr (&Sminibuffer_window); |
| 6892 | defsubr (&Swindow_minibuffer_p); | 6879 | defsubr (&Swindow_minibuffer_p); |