*** empty log message ***

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c09e3152376889034c6cb699bc50065b2a7ffe20..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
@@ -367,7 +368,8 @@ since it could result in memory overflow and make Emacs crash."
                       (eq system-type 'windows-nt))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
                       (or (boundp 'gtk)
-                          (and (display-graphic-p)
+                          (and window-system
+                               (not (eq window-system 'pc))
                                (not (eq system-type 'windows-nt)))))
                      ((string-match "\\`x-" (symbol-name symbol))
                       (fboundp 'x-create-frame))