Merge from emacs--devo--0

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b7aa673f1b8c519aa991ef67f28d4aba82bc06da..e2cb65c82c4ebdb2420b29cb64181f1b6327b9c3 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -122,8 +122,11 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                  :value (undecided . undecided)
                                  (coding-system :tag "Decoding")
                                  (coding-system :tag "Encoding"))
-                           (coding-system :tag "Single coding system"
-                                          :value undecided)
+                           (coding-system
+                            :tag "Single coding system"
+                            :value undecided
+                            :match (lambda (widget value)
+                                     (and value (not (functionp value)))))
                            (function :value ignore))))
             (selection-coding-system mule coding-system)
             ;; dired.c
@@ -139,6 +142,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             ;; eval.c
             (max-specpdl-size limits integer)
             (max-lisp-eval-depth limits integer)
+            (max-mini-window-height limits
+                                    (choice (const :tag "quarter screen" nil)
+                                            number))
             (stack-trace-on-error debug
                                   (choice (const :tag "off")
                                           (repeat :menu-tag "When"
@@ -338,7 +344,11 @@ since it could result in memory overflow and make Emacs crash."
             (split-height-threshold windows integer)
             (window-min-height windows integer)
             (window-min-width windows integer)
-            (scroll-preserve-screen-position windows boolean)
+            (scroll-preserve-screen-position
+             windows (choice
+                      (const :tag "Off (nil)" :value nil)
+                      (const :tag "Full screen (t)" :value t)
+                      (other :tag "Always" 1)))
             (display-buffer-reuse-frames windows boolean "21.1")
             ;; xdisp.c
             (scroll-step windows integer)