aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Marshall1997-05-26 08:17:39 +0000
committerSimon Marshall1997-05-26 08:17:39 +0000
commiteddd51c2807805e47aa70008234111b601e9a050 (patch)
tree826d79e9cc8f37974019df8acfd2c4f21f0e1a84 /src
parent8a07bba056ee23c4294d490115549a90671bff17 (diff)
downloademacs-eddd51c2807805e47aa70008234111b601e9a050.tar.gz
emacs-eddd51c2807805e47aa70008234111b601e9a050.zip
frame-override-unsplittable/inhibit-frame-unsplittable name change.
Diffstat (limited to 'src')
-rw-r--r--src/window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index 803cf7da0c2..373a46b6a98 100644
--- a/src/window.c
+++ b/src/window.c
@@ -120,7 +120,7 @@ Lisp_Object Vwindow_configuration_change_hook;
120static int scroll_preserve_screen_position; 120static int scroll_preserve_screen_position;
121 121
122/* Non-nil means we can split a frame even if it is "unsplittable". */ 122/* Non-nil means we can split a frame even if it is "unsplittable". */
123static int frame_override_unsplittable; 123static int inhibit_frame_unsplittable;
124 124
125#define min(a, b) ((a) < (b) ? (a) : (b)) 125#define min(a, b) ((a) < (b) ? (a) : (b))
126 126
@@ -2397,7 +2397,7 @@ and put SIZE columns in the first of the pair.")
2397 2397
2398 if (MINI_WINDOW_P (o)) 2398 if (MINI_WINDOW_P (o))
2399 error ("Attempt to split minibuffer window"); 2399 error ("Attempt to split minibuffer window");
2400 else if (FRAME_NO_SPLIT_P (fo) && ! frame_override_unsplittable) 2400 else if (FRAME_NO_SPLIT_P (fo) && ! inhibit_frame_unsplittable)
2401 error ("Attempt to split unsplittable frame"); 2401 error ("Attempt to split unsplittable frame");
2402 2402
2403 check_min_window_sizes (); 2403 check_min_window_sizes ();
@@ -3779,7 +3779,7 @@ If there is only one window, it is split regardless of this value.");
3779The selected frae is the one whose configuration has changed."); 3779The selected frae is the one whose configuration has changed.");
3780 Vwindow_configuration_change_hook = Qnil; 3780 Vwindow_configuration_change_hook = Qnil;
3781 3781
3782 DEFVAR_BOOL ("frame-override-unsplittable", &frame_override_unsplittable, 3782 DEFVAR_BOOL ("inhibit-frame-unsplittable", &inhibit_frame_unsplittable,
3783 "Non-nil means allow splitting an `unsplittable' frame.\n\ 3783 "Non-nil means allow splitting an `unsplittable' frame.\n\
3784\(That means, a frame whise `unsplittable' parameter is non-nil.)\n\ 3784\(That means, a frame whise `unsplittable' parameter is non-nil.)\n\
3785Packages such as Ispell that work by splitting the selected frame\n\ 3785Packages such as Ispell that work by splitting the selected frame\n\