* lisp/epa-file.el (epa-file-select-keys): Revert to nil default.

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 6113a4321c5677e238ce661c6ccbf6274437ee3b..389716b35b95d4905e54d07853e70969c3af14e6 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -388,19 +388,18 @@ since it could result in memory overflow and make Emacs crash."
             ;; window.c
             (temp-buffer-show-function windows (choice (const nil) function))
             (next-screen-context-lines windows integer)
-            (window-min-height windows integer)
-            (window-min-width windows integer)
             (scroll-preserve-screen-position
              windows (choice
                       (const :tag "Off (nil)" :value nil)
                       (const :tag "Full screen (t)" :value t)
                       (other :tag "Always" 1)) "22.1")
-            (recenter-redisplay windows
-                                (choice
-                                 (const :tag "Never (nil)" :value nil)
-                                 (const :tag "Only on ttys" :value tty)
-                                 (other :tag "Always" t))
-                                "23.1")
+            (recenter-redisplay
+             windows (choice
+                      (const :tag "Never (nil)" :value nil)
+                      (const :tag "Only on ttys" :value tty)
+                      (other :tag "Always" t)) "23.1")
+            (window-splits windows boolean "24.1")
+            (window-nest windows boolean "24.1")
             ;; xdisp.c
             (show-trailing-whitespace whitespace-faces boolean nil
                                       :safe booleanp)