Merge commit 'toshiharu/master' into toshiharu_require-final-newline

Conflicts: ChangeLog
hayamiz · Dec 8, 2009 · 95ff06b · 95ff06b
2 parents 1ba4674 + 9dd225f
commit 95ff06b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,13 @@
 	(twittering-other-user-timeline-interactive): changed init string
 	to nil
 
+2009-12-06  NAKAYA Toshiharu  <toshiharu.nakaya@gmail.com>
+
+	* twittering-mode.el (twittering-retrieve-image-without-wget): set
+	require-final-newline is nil locally since emacs can not save icon
+	images because of "error in process filter: save-buffer: Text is
+	read-only".
+
 2009-12-06  Tadashi MATSUO  <matsuo@i.ci.ritsumei.ac.jp>
 
 	* twittering-mode.el (twittering-use-wget): new variable for

diff --git a/twittering-mode.el b/twittering-mode.el
@@ -1326,7 +1326,8 @@ If STATUS-DATUM is already in DATA-VAR, return nil. If not, return t."
       (unless (file-exists-p file)
 	(url-retrieve
 	 url `(lambda (status)
-		(let ((coding-system-for-write 'binary))
+		(let ((coding-system-for-write 'binary)
+		      (require-final-newline nil))
 		  (goto-char (point-min))
 		  (search-forward-regexp "^$")
 		  (goto-char (1+ (point)))