*** empty log message ***

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index f9d7bc4730cb9cec84aae15b8512fc9df8fb5f7a..9881012d949afa40061b40975a7514d35bc9ccd5 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -99,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
@@ -172,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
@@ -217,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
@@ -364,9 +367,16 @@ since it could result in memory overflow and make Emacs crash."
                      ((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!