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 c2a3a32e218514d7752b04a16989f6f9801410c2..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
@@ -179,7 +178,10 @@
              "21.1")
             (minibuffer-auto-raise minibuffer boolean)
             ;; options property set at end
-            (read-buffer-function minibuffer (choice nil function))
+            (read-buffer-function minibuffer
+                                  (choice (const nil)
+                                          (function-item iswitchb-read-buffer)
+                                          function))
             ;; msdos.c
             (dos-unsupported-char-glyph display integer)
             ;; process.c
@@ -188,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 
@@ -222,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)
@@ -295,7 +298,6 @@
        (put symbol 'custom-type type)
        (put symbol 'custom-version version)))))
 
-(custom-add-option 'read-buffer-function 'iswitchb-read-buffer)
 (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable)
 
 ;; Record cus-start as loaded
@@ -305,4 +307,4 @@
 (unless purify-flag
   (provide 'cus-start))
 
-;;; cus-start.el ends here.
+;;; cus-start.el ends here