*** empty log message ***

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 7289533a273d22147b850800bf66d5f5c4f8d2a1..e9332ce9de4491e6c481ebf8cf9cbca24f5ce46d 100644 (file)
--- 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
@@ -67,10 +64,16 @@
             (exec-path execute
                        (repeat (choice (const :tag "default" nil)
                                        (file :format "%v"))))
+            ;; coding.c
+            (inhibit-eol-conversion mule boolean)
+            (eol-mnemonic-undecided mule string)
+            (eol-mnemonic-unix mule string)
+            (eol-mnemonic-dos mule string)
+            (eol-mnemonic-mac mule string)
             ;; 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)
@@ -134,6 +137,8 @@
             (completion-auto-help minibuffer boolean)
             (enable-recursive-minibuffers minibuffer boolean)
             (minibuffer-auto-raise minibuffer boolean)
+            ;; msdos.c
+            (dos-unsupported-char-glyph display integer)
             ;; process.c
             (delete-exited-processes processes-basics boolean)
             ;; syntax.c
@@ -178,8 +183,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)
@@ -188,10 +196,13 @@
                                            (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")))))
-      this symbol group type
+                                (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)
@@ -211,10 +222,20 @@
          all (cdr all)
          symbol (nth 0 this)
          group (nth 1 this)
-         type (nth 2 this))
+         type (nth 2 this)
+         ;; Don't complain about missing variables which are
+         ;; irrelevant to this platform.
+         native-p (save-match-data
+                    (cond
+                     ((string-match "\\`dos-" (symbol-name symbol))
+                      (eq system-type 'ms-dos))
+                     ((string-match "\\`w32-" (symbol-name symbol))
+                      (eq system-type 'windows-nt))
+                     (t t))))
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!
-       (message "Note, built-in variable `%S' not bound" symbol)
+       (and native-p
+            (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