X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/de0d1fc591c28141e0fcce1b407b28fb87949cda..f52154007f41abe6857acab91e31ab4a7d18210d:/lisp/cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 6ca90bc943..2a7b3b314b 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins.
 ;;
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -52,14 +52,11 @@
 	     (tab-width editing-basics integer)
 	     (ctl-arrow display boolean)
 	     (truncate-lines display boolean)
-	     (selective-display display 
-				(choice (const :tag "off" nil)
-					(integer :tag "space"
-						 :format "%v"
-						 1)
-					(other :tag "on" t)))
 	     (selective-display-ellipses display boolean)
 	     (transient-mark-mode editing-basics boolean)
+	     (indicate-empty-lines display boolean)
+	     (scroll-up-aggressively windows boolean)
+	     (scroll-down-aggressively windows boolean)
 	     ;; callint.c
 	     (mark-even-if-inactive editing-basics boolean)
 	     ;; callproc.c
@@ -76,7 +73,7 @@
 	     ;; dired.c
 	     (completion-ignored-extensions dired 
 					    (repeat (string :format "%v")))
-	     ;; dispnew.el
+	     ;; dispnew.c
 	     (baud-rate display integer)
 	     (inverse-video display boolean)
 	     (visible-bell display boolean)
@@ -107,6 +104,8 @@
 				    (const :tag "always" t)))
 	     ;; fileio.c
 	     (insert-default-directory minibuffer boolean)
+	     ;; fns.c
+	     (use-dialog-box menu boolean)
 	     ;; frame.c
 	     (default-frame-alist frames
 	       (repeat (cons :format "%v"
@@ -119,7 +118,7 @@
 	     (auto-save-interval auto-save integer)
 	     (auto-save-timeout auto-save (choice (const :tag "off" nil)
 						  (integer :format "%v")))
-	     (echo-keystrokes minibuffer integer)
+	     (echo-keystrokes minibuffer number)
 	     (polling-period keyboard integer)
 	     (double-click-time mouse (restricted-sexp
 				       :match-alternatives (integerp 'nil 't)))
@@ -186,8 +185,11 @@
 	     (split-height-threshold windows integer)
 	     (window-min-height windows integer)
 	     (window-min-width windows integer)
+	     (scroll-preserve-screen-position windows boolean)
 	     ;; xdisp.c
 	     (scroll-step windows integer)
+	     (scroll-conservatively windows integer)
+	     (scroll-margin windows integer)
 	     (truncate-partial-width-windows display boolean)
 	     (mode-line-inverse-video modeline boolean)
 	     (line-number-display-limit display integer)
@@ -196,16 +198,18 @@
 					    (integer :menu-tag "lines"
 						     :format "%v")
 					    (other :tag "Unlimited" t)))
+	     (unibyte-display-via-language-environment mule boolean)
 	     ;; xfns.c
 	     (x-bitmap-file-path installation
-				 (repeat (directory :format "%v")))))
+				 (repeat (directory :format "%v")))
+	     ;; xterm.c
+	     (x-stretch-cursor display boolean)))
       this symbol group type native-p
       ;; This function turns a value
       ;; into an expression which produces that value.
       (quoter (lambda (sexp)
 		(if (or (memq sexp '(t nil))
-			(and (symbolp sexp)
-			     (eq (aref (symbol-name sexp) 0) ?:))
+			(keywordp sexp)
 			(and (listp sexp)
 			     (memq (car sexp) '(lambda)))
 			(stringp sexp)