Resize to 48px in default

(twittering-convert-fix-size): set 48px as the default size of icon images.
hayamiz · Dec 30, 2009 · 28f89c5 · 28f89c5
1 parent e7423f2
commit 28f89c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:ChangeLog
 2009-12-30  Satoshi Yatagawa  <yata_github@y.hauN.org>
 
 	* twittering-mode.el (twittering-get-response-header): Correct a
@@ -10,6 +11,8 @@
 	* twittering-mode.el (twittering-image-type): No temporary files
 	for resing images. Use standard in/out and temporary buffers
 	instead.
+	(twittering-convert-fix-size): set 48px as the default size of
+	icon images.
 
 2009-12-30  Tadashi MATSUO  <tad@mymail.twin.jp>
 

diff --git a/twittering-mode.el b/twittering-mode.el
@@ -299,7 +299,7 @@ icon mode; otherwise, turn off icon mode."
 (defvar twittering-image-stack nil)
 (defvar twittering-image-type-cache nil)
 (defvar twittering-convert-program (executable-find "convert"))
-(defvar twittering-convert-fix-size nil)
+(defvar twittering-convert-fix-size 48)
 (defvar twittering-use-convert (not (null (executable-find "convert")))
   "*This variable makes a sense only if `twittering-convert-fix-size'
 is non-nil. If this variable is non-nil, icon images are converted by