Delete the autoloads for functions defined with ibuffer-specific commands.

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 620a870090bd00b164247a9615863c4e2fedfbe9..ea530a6d719a58c543ca723bc21548d842de7462 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 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -142,7 +142,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,7 +155,33 @@
             ;; minibuf.c
             (completion-auto-help minibuffer boolean)
             (enable-recursive-minibuffers minibuffer boolean)
+            (minibuffer-prompt-properties
+             minibuffer
+             (list
+              (checklist :inline t
+                         (const :tag "Read-Only"
+                                :doc "Prevent prompt from being modified"
+                                :format "%t%n%h"
+                                :inline t
+                                (read-only t))
+                         (const :tag "Inviolable"
+                                :doc "Prevent point from ever entering prompt"
+                                :format "%t%n%h"
+                                :inline t
+                                (point-entered minibuffer-avoid-prompt)))
+              (repeat :inline t
+                      :tag "Other Properties"
+                      (list :inline t
+                            :format "%v"
+                            (symbol :tag "Property")
+                            (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
@@ -165,8 +190,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 
@@ -199,6 +224,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)
@@ -272,6 +298,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
@@ -279,4 +307,4 @@
 (unless purify-flag
   (provide 'cus-start))
 
-;;; cus-start.el ends here.
+;;; cus-start.el ends here