diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-02-06 19:31:29 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-02-06 19:31:29 -0800 |
| commit | af008560fea31dff76f6d7df3e386cf2af623a8d (patch) | |
| tree | 2d463d836e43ecbde5ba13f7ed81744134c69911 /lisp/cus-start.el | |
| parent | 1f0f21c51107e8a2d6e223840018dfdf3dbafee2 (diff) | |
| download | emacs-af008560fea31dff76f6d7df3e386cf2af623a8d.tar.gz | |
imagemagick-render-type fixes
* src/image.c (imagemagick-render-type): Change it from a lisp object
to an integer. Move the doc here from the lisp manual.
Treat all values not equal to 0 the same.
* doc/lispref/display.texi (ImageMagick Images):
Move most details of imagemagick-render-type to the variable's doc.
* lisp/cus-start.el (imagemagick-render-type): Add it.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 4 |
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 :set custom-set-minor-mode) ;; fringe.c (overflow-newline-into-fringe fringe boolean) + ;; image.c + (imagemagick-render-type image integer "24.1") ;; indent.c (indent-tabs-mode indent boolean) ;; keyboard.c @@ -504,6 +506,8 @@ since it could result in memory overflow and make Emacs crash." (fboundp 'x-selection-exists-p)) ((string-match "fringe" (symbol-name symbol)) (fboundp 'define-fringe-bitmap)) + ((string-match "\\`imagemagick" (symbol-name symbol)) + (fboundp 'imagemagick-types)) ((equal "font-use-system-font" (symbol-name symbol)) (featurep 'system-font-setting)) ;; Conditioned on x-create-frame, because that's |