*** empty log message ***

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b61275f42110ccbe4de66730040e4df4c219387f..9881012d949afa40061b40975a7514d35bc9ccd5 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,7 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -40,20 +41,6 @@
             ;; alloc.c
             (gc-cons-threshold alloc integer)
             (garbage-collection-messages alloc boolean)
-            ;; undo.c
-            (undo-limit undo integer)
-            (undo-strong-limit undo integer)
-            (undo-outer-limit undo
-                              (choice integer
-                                      (const :tag "No limit"
-                                             :format "%t\n%d"
-                                             :doc
-                                             "With this choice, \
-the undo info for the current command never gets discarded.
-This should only be chosen under exceptional circumstances,
-since it could result in memory overflow and make Emacs crash."
-                                             nil))
-                              "22.1")
             ;; buffer.c
             (mode-line-format modeline sexp) ;Hard to do right.
             (default-major-mode internal function)
@@ -112,6 +99,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (scroll-down-aggressively windows
                                       (choice (const :tag "off" nil) number)
                                       "21.1")
+            (line-spacing display (choice (const :tag "none" nil) integer))
             ;; callint.c
             (mark-even-if-inactive editing-basics boolean)
             ;; callproc.c
@@ -185,6 +173,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (mouse-highlight mouse (choice (const :tag "disabled" nil)
                                            (const :tag "always shown" t)
                                            (other :tag "hidden by keypress" 1)))
+            ;; fringe.c
+            (overflow-newline-into-fringe fringe boolean "22.1")
             ;; indent.c
             (indent-tabs-mode fill boolean)
             ;; keyboard.c
@@ -230,7 +220,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                 :format "%t%n%h"
                                 :inline t
                                 (read-only t))
-                         (const :tag "Inviolable"
+                         (const :tag "Don't Enter"
                                 :doc "Prevent point from ever entering prompt"
                                 :format "%t%n%h"
                                 :inline t
@@ -257,6 +247,20 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (words-include-escapes editing-basics boolean)
             (open-paren-in-column-0-is-defun-start editing-basics boolean
                                                    "21.1")
+            ;; undo.c
+            (undo-limit undo integer)
+            (undo-strong-limit undo integer)
+            (undo-outer-limit undo
+                              (choice integer
+                                      (const :tag "No limit"
+                                             :format "%t\n%d"
+                                             :doc
+                                             "With this choice, \
+the undo info for the current command never gets discarded.
+This should only be chosen under exceptional circumstances,
+since it could result in memory overflow and make Emacs crash."
+                                             nil))
+                              "22.1")
             ;; window.c
             (temp-buffer-show-function windows (choice (const nil) function))
             (display-buffer-function windows (choice (const nil) function))
@@ -363,9 +367,16 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                      ((string-match "\\`w32-" (symbol-name symbol))
                       (eq system-type 'windows-nt))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
-                      (or (boundp 'gtk) (not (eq system-type 'windows-nt))))
+                      (or (boundp 'gtk)
+                          (and window-system
+                               (not (eq window-system 'pc))
+                               (not (eq system-type 'windows-nt)))))
                      ((string-match "\\`x-" (symbol-name symbol))
                       (fboundp 'x-create-frame))
+                     ((string-match "selection" (symbol-name symbol))
+                      (fboundp 'x-selection-exists-p))
+                     ((string-match "fringe" (symbol-name symbol))
+                      (fboundp 'define-fringe-bitmap))
                      (t t))))
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!