procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Revert "Recognize graphicsmagick in image-dired"

Browse source 
This reverts commit 5c266405f5.
There are too many annoying differences between GM and IM to make this
default behavior.
This commit is contained in:
Mark Oteiza 2016-12-20 11:14:53 -05:00
parent 15817f4e3a
commit 221d3a9767
1 changed files with 15 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lisp/image-dired.el
View file

@ -221,19 +221,14 @@ expects to find pictures in this directory."
:group 'image-dired)
(defcustom image-dired-cmd-create-thumbnail-program
(cond ((executable-find "gm") "gm")
((executable-find "convert") "convert")
(t "convert"))
"convert"
"Executable used to create thumbnail.
Used together with `image-dired-cmd-create-thumbnail-options'."
:version "26.1"
:type 'file
:group 'image-dired)
(defcustom image-dired-cmd-create-thumbnail-options
`(,@(when (string-match "gm\\'" image-dired-cmd-create-thumbnail-program)
'("convert"))
"-size" "%wx%h" "%f" "-resize" "%wx%h>" "-strip" "jpeg:%t")
'("-size" "%wx%h" "%f" "-resize" "%wx%h>" "-strip" "jpeg:%t")
"Options of command used to create thumbnail image.
Used with `image-dired-cmd-create-thumbnail-program'.
Available format specifiers are: %w which is replaced by
@ -244,20 +239,14 @@ which is replaced by the file name of the thumbnail file."
:type '(repeat (string :tag "Argument"))
:group 'image-dired)
(defcustom image-dired-cmd-create-temp-image-program
(cond ((executable-find "gm") "gm")
((executable-find "convert") "convert")
(t "convert"))
(defcustom image-dired-cmd-create-temp-image-program "convert"
"Executable used to create temporary image.
Used together with `image-dired-cmd-create-temp-image-options'."
:version "26.1"
:type 'file
:group 'image-dired)
(defcustom image-dired-cmd-create-temp-image-options
`(,@(when (string-match "gm\\'" image-dired-cmd-create-temp-image-program)
'("convert"))
"-size" "%wx%h" "%f" "-resize" "%wx%h>" "-strip" "jpeg:%t")
'("-size" "%wx%h" "%f" "-resize" "%wx%h>" "-strip" "jpeg:%t")
"Options of command used to create temporary image for display window.
Used together with `image-dired-cmd-create-temp-image-program',
Available format specifiers are: %w and %h which are replaced by
@ -327,17 +316,15 @@ Available format specifiers are described in
:group 'image-dired)
(defcustom image-dired-cmd-create-standard-thumbnail-options
`(,@(when (string-match "gm\\'" image-dired-cmd-create-thumbnail-program)
'("convert"))
"-size" "%wx%h" "%f"
,@(unless (or image-dired-cmd-pngcrush-program
image-dired-cmd-pngnq-program)
(list
"-set" "Thumb::MTime" "%m"
"-set" "Thumb::URI" "file://%f"
"-set" "Description" "Thumbnail of file://%f"
"-set" "Software" (emacs-version)))
"-thumbnail" "%wx%h>" "png:%t")
(append '("-size" "%wx%h" "%f")
(unless (or image-dired-cmd-pngcrush-program
image-dired-cmd-pngnq-program)
(list
"-set" "Thumb::MTime" "%m"
"-set" "Thumb::URI" "file://%f"
"-set" "Description" "Thumbnail of file://%f"
"-set" "Software" (emacs-version)))
'("-thumbnail" "%wx%h>" "png:%t"))
"Options for creating thumbnails according to the Thumbnail Managing Standard.
Available format specifiers are the same as in
`image-dired-cmd-create-thumbnail-options', with %m for file modification time."
@ -346,19 +333,14 @@ Available format specifiers are the same as in
:group 'image-dired)
(defcustom image-dired-cmd-rotate-thumbnail-program
(cond ((executable-find "gm") "gm")
((executable-find "mogrify") "mogrify")
(t "mogrify"))
"mogrify"
"Executable used to rotate thumbnail.
Used together with `image-dired-cmd-rotate-thumbnail-options'."
:version "26.1"
:type 'file
:group 'image-dired)
(defcustom image-dired-cmd-rotate-thumbnail-options
`(,@(when (string-match "gm\\'" image-dired-cmd-rotate-thumbnail-program)
'("mogrify"))
"-rotate" "%d" "%t")
'("-rotate" "%d" "%t")
"Arguments of command used to rotate thumbnail image.
Used with `image-dired-cmd-rotate-thumbnail-program'.
Available format specifiers are: %d which is replaced by the