(parse_charset_map): Remove an unused variable.

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 1b944d7..724b79a 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,6 @@
-;;; cus-start.el --- define customization properties of builtins.
+;;; cus-start.el --- define customization properties of builtins
 ;;
-;; Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -124,6 +124,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
@@ -142,7 +145,6 @@
             (suggest-key-bindings keyboard (choice (const :tag "off" nil)
                                                    (integer :tag "time" 2)
                                                    (other :tag "on")))
-            ;; lread.c
 
 ;; This is not good news because it will use the wrong
 ;; version-specific directories when you upgrade.  We need
@@ -156,6 +158,9 @@
             ;; minibuf.c
             (completion-auto-help minibuffer boolean)
             (enable-recursive-minibuffers minibuffer boolean)
+            (history-length minibuffer
+                            (choice (const :tag "Infinite" t)
+                                    integer))
             (minibuffer-prompt-properties
              minibuffer
              (list
@@ -175,8 +180,14 @@
                       (list :inline t
                             :format "%v"
                             (symbol :tag "Property")
-                            (sexp :tag "Value")))))
+                            (sexp :tag "Value"))))
+             "21.1")
             (minibuffer-auto-raise minibuffer boolean)
+            ;; options property set at end
+            (read-buffer-function minibuffer
+                                  (choice (const nil)
+                                          (function-item iswitchb-read-buffer)
+                                          function))
             ;; msdos.c
             (dos-unsupported-char-glyph display integer)
             ;; process.c
@@ -185,8 +196,8 @@
             (parse-sexp-ignore-comments editing-basics boolean)
             (words-include-escapes editing-basics boolean)
             ;; window.c
-            (temp-buffer-show-function windows function)
-            (display-buffer-function windows function)
+            (temp-buffer-show-function windows (choice (const nil) function))
+            (display-buffer-function windows (choice (const nil) function))
             (pop-up-frames frames boolean)
             (pop-up-frame-function frames function)
             (special-display-buffer-names 
@@ -219,6 +230,7 @@
             (same-window-buffer-names windows (repeat (string :format "%v")))
             (same-window-regexps windows (repeat (regexp :format "%v")))
             (pop-up-windows windows boolean)
+            (even-window-heights windows boolean)
             (next-screen-context-lines windows integer)
             (split-height-threshold windows integer)
             (window-min-height windows integer)
@@ -229,7 +241,11 @@
             (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")
             (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)))
@@ -243,6 +259,8 @@
             (x-bitmap-file-path installation
                                 (repeat (directory :format "%v")))
             ;; xterm.c
+             (x-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
       ;; This function turns a value
@@ -273,6 +291,8 @@
                       (eq system-type 'ms-dos))
                      ((string-match "\\`w32-" (symbol-name symbol))
                       (eq system-type 'windows-nt))
+                     ((string-match "\\`x-" (symbol-name symbol))
+                      (fboundp 'x-create-frame))
                      (t t))))
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!
@@ -291,6 +311,8 @@
        (put symbol 'custom-type type)
        (put symbol 'custom-version version)))))
 
+(custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable)
+
 ;; Record cus-start as loaded
 ;; if we have set up all the info that we can set up.
 ;; Don't record cus-start as loaded
@@ -298,4 +320,4 @@
 (unless purify-flag
   (provide 'cus-start))
 
-;;; cus-start.el ends here.
+;;; cus-start.el ends here