*** empty log message ***

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index bb88d87007996112d17da89478586ecc18c8c1ea..e352739e8a903a1c9bb73047e31323027f49673e 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -34,7 +34,7 @@
 
 ;;; Code:
 
-(let ((all '(;; abbrev.c 
+(let ((all '(;; abbrev.c
             (abbrev-all-caps abbrev-mode boolean)
             (pre-abbrev-expand-hook abbrev-mode hook)
             ;; alloc.c
@@ -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
@@ -87,7 +90,7 @@
                            (function :value ignore))))
             (selection-coding-system mule coding-system)
             ;; dired.c
-            (completion-ignored-extensions dired 
+            (completion-ignored-extensions dired
                                            (repeat (string :format "%v")))
             ;; dispnew.c
             (baud-rate display integer)
@@ -105,7 +108,7 @@
                                                   :value (nil)
                                                   (symbol :format "%v"))
                                           (const :tag "always" t)))
-            (debug-on-error debug 
+            (debug-on-error debug
                             (choice (const :tag "off")
                                     (repeat :menu-tag "When"
                                             :value (nil)
@@ -141,6 +144,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")))
@@ -153,7 +157,7 @@
 ;; version-specific directories when you upgrade.  We need
 ;; customization of the front of the list, maintaining the standard
 ;; value intact at the back.
-;;;         (load-path environment 
+;;;         (load-path environment
 ;;;                    (repeat (choice :tag "[Current dir?]"
 ;;;                                    :format "%[Current dir?%] %v"
 ;;;                                    (const :tag " current dir" nil)
@@ -203,8 +207,8 @@
             (display-buffer-function windows (choice (const nil) function))
             (pop-up-frames frames boolean)
             (pop-up-frame-function frames function)
-            (special-display-buffer-names 
-             frames 
+            (special-display-buffer-names
+             frames
              (repeat (choice :tag "Buffer"
                              :value ""
                              (string :format "%v")
@@ -217,7 +221,7 @@
                                                  (symbol :tag "Parameter")
                                                  (sexp :tag "Value")))))))
             (special-display-regexps
-             frames 
+             frames
              (repeat (choice :tag "Buffer"
                              :value ""
                              (regexp :format "%v")
@@ -244,8 +248,8 @@
             (scroll-step windows integer)
             (scroll-conservatively windows integer)
             (scroll-margin windows integer)
-            (automatic-hscroll-margin windows integer "21.3")
-            (automatic-hscroll-step windows number "21.3")
+            (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")
@@ -264,7 +268,7 @@
             (x-bitmap-file-path installation
                                 (repeat (directory :format "%v")))
             ;; xterm.c
-             (x-autoselect-window display boolean "21.3")
+             (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
@@ -281,7 +285,7 @@
                        (numberp sexp))
                    sexp
                  (list 'quote sexp)))))
-  (while all 
+  (while all
     (setq this (car all)
          all (cdr all)
          symbol (nth 0 this)
@@ -305,7 +309,7 @@
             (message "Note, built-in variable `%S' not bound" symbol))
       ;; Save the standard value, unless we already did.
       (or (get symbol 'standard-value)
-         (put symbol 'standard-value 
+         (put symbol 'standard-value
               (list (funcall quoter (default-value symbol)))))
       ;; If this is NOT while dumping Emacs,
       ;; set up the rest of the customization info.
@@ -317,6 +321,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.