Update the description of version handling.

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 0275624842a60a83d139322d838b55aee88d182b..c09662ff60b3473d7f74ee25dc8de8d1495891c5 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -53,10 +53,13 @@
             (ctl-arrow display boolean)
             (truncate-lines display boolean)
             (selective-display-ellipses display boolean)
-            (transient-mark-mode editing-basics boolean)
             (indicate-empty-lines display boolean "21.1")
-            (scroll-up-aggressively windows boolean "21.1")
-            (scroll-down-aggressively windows boolean "21.1")
+            (scroll-up-aggressively windows
+                                    (choice (const :tag "off" nil) number)
+                                    "21.1")
+            (scroll-down-aggressively windows
+                                      (choice (const :tag "off" nil) number)
+                                      "21.1")
             ;; callint.c
             (mark-even-if-inactive editing-basics boolean)
             ;; callproc.c
@@ -83,6 +86,7 @@
                            (coding-system :tag "Single coding system"
                                           :value undecided)
                            (function :value ignore))))
+            (selection-coding-system mule coding-system)
             ;; dired.c
             (completion-ignored-extensions dired 
                                            (repeat (string :format "%v")))
@@ -124,6 +128,9 @@
               (repeat (cons :format "%v"
                             (symbol :tag "Parameter")
                             (sexp :tag "Value"))))
+            (mouse-highlight mouse (choice (const :tag "disabled" nil)
+                                           (const :tag "always shown" t)
+                                           (other :tag "hidden by keypress" 1)))
             ;; indent.c
             (indent-tabs-mode fill boolean)
             ;; keyboard.c
@@ -135,6 +142,7 @@
             (polling-period keyboard integer)
             (double-click-time mouse (restricted-sexp
                                       :match-alternatives (integerp 'nil 't)))
+            (double-click-fuzz mouse integer)
             (inhibit-local-menu-bar-menus menu boolean)
             (help-char keyboard character)
             (help-event-list keyboard (repeat (sexp :format "%v")))
@@ -238,8 +246,11 @@
             (scroll-step windows integer)
             (scroll-conservatively windows integer)
             (scroll-margin windows integer)
+            (hscroll-margin windows integer "21.3")
+            (hscroll-step windows number "21.3")
             (truncate-partial-width-windows display boolean)
             (mode-line-inverse-video modeline boolean)
+            (mode-line-in-non-selected-windows modeline boolean "21.3")
             (line-number-display-limit display
                                        (choice integer
                                                (const :tag "No limit" nil)))
@@ -249,10 +260,13 @@
                                                     :format "%v")
                                            (other :tag "Unlimited" t)))
             (unibyte-display-via-language-environment mule boolean)
+            ;; xfaces.c
+            (scalable-fonts-allowed display boolean)
             ;; xfns.c
             (x-bitmap-file-path installation
                                 (repeat (directory :format "%v")))
             ;; xterm.c
+             (mouse-autoselect-window display boolean "21.3")
             (x-use-underline-position-properties display boolean "21.3")
             (x-stretch-cursor display boolean "21.1")))
       this symbol group type native-p version
@@ -305,6 +319,10 @@
        (put symbol 'custom-version version)))))
 
 (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable)
+(put 'selection-coding-system 'custom-set
+     (lambda (symbol value)
+       (set-selection-coding-system value)
+       (set symbol value)))
 
 ;; Record cus-start as loaded
 ;; if we have set up all the info that we can set up.