aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2cee72d717e..a5032cf99e7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -237,6 +237,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
237 :set custom-set-minor-mode) 237 :set custom-set-minor-mode)
238 ;; fringe.c 238 ;; fringe.c
239 (overflow-newline-into-fringe fringe boolean) 239 (overflow-newline-into-fringe fringe boolean)
240 ;; image.c
241 (imagemagick-render-type image integer "24.1")
240 ;; indent.c 242 ;; indent.c
241 (indent-tabs-mode indent boolean) 243 (indent-tabs-mode indent boolean)
242 ;; keyboard.c 244 ;; keyboard.c
@@ -504,6 +506,8 @@ since it could result in memory overflow and make Emacs crash."
504 (fboundp 'x-selection-exists-p)) 506 (fboundp 'x-selection-exists-p))
505 ((string-match "fringe" (symbol-name symbol)) 507 ((string-match "fringe" (symbol-name symbol))
506 (fboundp 'define-fringe-bitmap)) 508 (fboundp 'define-fringe-bitmap))
509 ((string-match "\\`imagemagick" (symbol-name symbol))
510 (fboundp 'imagemagick-types))
507 ((equal "font-use-system-font" (symbol-name symbol)) 511 ((equal "font-use-system-font" (symbol-name symbol))
508 (featurep 'system-font-setting)) 512 (featurep 'system-font-setting))
509 ;; Conditioned on x-create-frame, because that's 513 ;; Conditioned on x-create-frame, because that's