Empty elements in EMACSLOADPATH now stand for the default

[bpt/emacs.git] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2e442b6..24f8ac3 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -252,7 +252,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (use-file-dialog menu boolean "22.1")
             (focus-follows-mouse frames boolean "20.3")
             ;; fontset.c
-            (vertical-centering-font-regexp display regexp)
+            ;; FIXME nil is the initial value, fontset.el setqs it.
+            (vertical-centering-font-regexp display
+                                            (choice (const nil) regexp))
             ;; frame.c
             (default-frame-alist frames
               (repeat (cons :format "%v"
@@ -447,14 +449,20 @@ since it could result in memory overflow and make Emacs crash."
                       (other :tag "Always (t)" :value t))
              "24.3")
             ;; xdisp.c
-            (show-trailing-whitespace whitespace-faces boolean nil
+            ;; The whitespace group is for whitespace.el.
+            (show-trailing-whitespace editing-basics boolean nil
                                       :safe booleanp)
             (scroll-step windows integer)
             (scroll-conservatively windows integer)
             (scroll-margin windows integer)
             (hscroll-margin windows integer "22.1")
             (hscroll-step windows number "22.1")
-            (truncate-partial-width-windows display boolean "23.1")
+            (truncate-partial-width-windows
+             display
+             (choice (integer :tag "Truncate if narrower than")
+                     (const :tag "Respect `truncate-lines'" nil)
+                     (other :tag "Truncate if not full-width" t))
+             "23.1")
             (make-cursor-line-fully-visible windows boolean)
             (mode-line-in-non-selected-windows mode-line boolean "22.1")
             (line-number-display-limit display