[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 221d3a9: ; Revert "Recognize graphicsmagick in imag
From: |
Mark Oteiza |
Subject: |
[Emacs-diffs] master 221d3a9: ; Revert "Recognize graphicsmagick in image-dired" |
Date: |
Tue, 20 Dec 2016 16:16:22 +0000 (UTC) |
branch: master
commit 221d3a9767422ba783aedcd354fd1fe2d60e9bb3
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>
; Revert "Recognize graphicsmagick in image-dired"
This reverts commit 5c266405f559823038dfa900aaad66605f0d5287.
There are too many annoying differences between GM and IM to make this
default behavior.
---
lisp/image-dired.el | 48 +++++++++++++++---------------------------------
1 file changed, 15 insertions(+), 33 deletions(-)
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index eed4280..560cadb 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 221d3a9: ; Revert "Recognize graphicsmagick in image-dired",
Mark Oteiza <=