Skip to content

Commit

Permalink
`convert' program is confirmed on entering twittering-mode.
Browse files Browse the repository at this point in the history
* twittering-mode.el (twittering-convert-program): initialize
without confirming whether `convert' comes from ImageMagick.
(twittering-mode-init-variables): confirm whether the found
`convert' is a part of ImageMagick or GraphicsMagick if
`twittering-use-convert' is non-nil. If the program does not come
from ImageMagick or GraphicsMagick, `twittering-use-convert' is
changed into nil.
  • Loading branch information
cvmat committed Jan 10, 2010
1 parent 9b2046f commit 9b10d1b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
10 changes: 10 additions & 0 deletions ChangeLog
@@ -1,3 +1,13 @@
2010-01-11 Tadashi MATSUO <tad@mymail.twin.jp>

* twittering-mode.el (twittering-convert-program): initialize
without confirming whether `convert' comes from ImageMagick.
(twittering-mode-init-variables): confirm whether the found
`convert' is a part of ImageMagick or GraphicsMagick if
`twittering-use-convert' is non-nil. If the program does not come
from ImageMagick or GraphicsMagick, `twittering-use-convert' is
changed into nil.

2010-01-10 Yuto Hayamizu <y.hayamizu@gmail.com>

* twittering-mode.el (twittering-convert-program): checks whether
Expand Down
19 changes: 10 additions & 9 deletions twittering-mode.el
Expand Up @@ -307,15 +307,7 @@ icon mode; otherwise, turn off icon mode."

(defvar twittering-image-stack nil)
(defvar twittering-image-type-cache nil)
(defvar twittering-convert-program
(let ((program (executable-find "convert")))
(and program
(with-temp-buffer
(call-process program nil (current-buffer) nil
"--version")
(goto-char (point-min))
(and (search-forward "ImageMagick" nil t)
program)))))
(defvar twittering-convert-program (executable-find "convert"))
(defvar twittering-convert-fix-size 48)
(defvar twittering-use-convert (not (null twittering-convert-program))
"*This variable makes a sense only if `twittering-convert-fix-size'
Expand Down Expand Up @@ -881,6 +873,15 @@ Return nil if STR is invalid as a timeline spec."
;; (add-to-list 'minor-mode-alist '(twittering-jojo-mode " tw-jojo"))
(setq twittering-username-active twittering-username)
(setq twittering-password-active twittering-password)
(when twittering-use-convert
(if (null twittering-convert-program)
(setq twittering-use-convert nil)
(with-temp-buffer
(call-process twittering-convert-program nil (current-buffer) nil
"-version")
(goto-char (point-min))
(if (null (search-forward-regexp "\\(Image\\|Graphics\\)Magick" nil t))
(setq twittering-use-convert nil)))))
(twittering-setup-proxy)
)

Expand Down

0 comments on commit 9b10d1b

Please sign in to comment.