frame-override-unsplittable/inhibit-frame-unsplittable name change.

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 817f8d281a797e43944bc43fb45611174f4b728a..5f470faa72a0acb81737a91cd8231cc5ac37dad7 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1479,7 +1479,7 @@ scrolling the current window.  Leave the new window selected."
       ;; So we increment the height for this case.
       (if (string-match "19\.9.*Lucid" (emacs-version))
          (setq height (1+ height)))
-      (let ((frame-override-unsplittable t))
+      (let ((inhibit-frame-unsplittable t))
        (split-window nil height))
       (set-window-start (next-window) top))))
 

diff --git a/src/window.c b/src/window.c
index 803cf7da0c2c808aa07c722df0abcfe052b18062..373a46b6a98b3d6ed333c27afa65b0a5f273b334 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -120,7 +120,7 @@ Lisp_Object Vwindow_configuration_change_hook;
 static int scroll_preserve_screen_position;
 
 /* Non-nil means we can split a frame even if it is "unsplittable".  */
-static int frame_override_unsplittable;
+static int inhibit_frame_unsplittable;
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 
@@ -2397,7 +2397,7 @@ and put SIZE columns in the first of the pair.")
 
   if (MINI_WINDOW_P (o))
     error ("Attempt to split minibuffer window");
-  else if (FRAME_NO_SPLIT_P (fo) && ! frame_override_unsplittable)
+  else if (FRAME_NO_SPLIT_P (fo) && ! inhibit_frame_unsplittable)
     error ("Attempt to split unsplittable frame");
 
   check_min_window_sizes ();
@@ -3779,7 +3779,7 @@ If there is only one window, it is split regardless of this value.");
 The selected frae is the one whose configuration has changed.");
   Vwindow_configuration_change_hook = Qnil;
 
-  DEFVAR_BOOL ("frame-override-unsplittable", &frame_override_unsplittable,
+  DEFVAR_BOOL ("inhibit-frame-unsplittable", &inhibit_frame_unsplittable,
     "Non-nil means allow splitting an `unsplittable' frame.\n\
 \(That means, a frame whise `unsplittable' parameter is non-nil.)\n\
 Packages such as Ispell that work by splitting the selected frame\n\