From 8be5e92709c5a9d2a46441faf00a5e230db75ac2 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sun, 13 Oct 2013 23:24:56 +0300
Subject: [PATCH] * mu4e: fix display of images

---
 mu4e/mu4e-utils.el | 16 ++++++++--------
 mu4e/mu4e-view.el  | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index dcee0b72..7ca2f6ca 100644
--- a/mu4e/mu4e-utils.el
+++ b/mu4e/mu4e-utils.el
@@ -975,15 +975,15 @@ and MAXHEIGHT are ignored."
 		   (create-image imgpath 'imagemagick nil :width maxwidth)
 		   (create-image imgpath 'imagemagick))
 		 (create-image imgpath))))
-    ;;(message "DISPLAY: %S %S" imgpath img)
     (when img
-      (insert "\n")
-      (let ((size (image-size img))) ;; inspired by gnus..
-	(insert-char ?\n
-	  (max 0 (round (- (window-height) (or maxheight (cdr size)) 1) 2)))
-	(insert-char ?\
-	  (max 0 (round (- (window-width)  (or maxwidth (car size))) 2)))
-	(insert-image img)))))
+      (save-excursion
+	(insert "\n")
+	(let ((size (image-size img))) ;; inspired by gnus..
+	  (insert-char ?\n
+	    (max 0 (round (- (window-height) (or maxheight (cdr size)) 1) 2)))
+	  (insert-char ?\.
+	    (max 0 (round (- (window-width)  (or maxwidth (car size))) 2)))
+	  (insert-image img))))))
 
 
 (defun mu4e-hide-other-mu4e-buffers ()
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 5b8e3e4c..5b5c2697 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -239,13 +239,13 @@ marking if it still had that."
     (with-current-buffer buf
       (switch-to-buffer buf)
       (let ((inhibit-read-only t))
-	(erase-buffer)
+ 	(erase-buffer)
 	(insert (mu4e-view-message-text msg))
 	(goto-char (point-min))
 	(mu4e~view-fontify-cited)
 	(mu4e~view-fontify-footer)
 	(mu4e~view-make-urls-clickable)
-	(mu4e~view-show-images-maybe msg)
+ 	(mu4e~view-show-images-maybe msg)
 
 	(if embedded
 	  (local-set-key "q" 'kill-buffer-and-window)
@@ -253,8 +253,7 @@ marking if it still had that."
 
     (unless (eq major-mode 'mu4e-view-mode)
       (mu4e-view-mode))
-
-	(setq ;; buffer local
+      (setq ;; buffer local
       mu4e~view-msg msg
 	  mu4e~view-headers-buffer headersbuf)
 
@@ -283,7 +282,8 @@ add text-properties to VAL."
       (when mu4e-view-fill-headers
 	;; temporarily set the fill column <margin> positions to the right, so
 	;; we can indent the following lines correctly
-	(let*((margin 1) (fill-column (- fill-column margin)))
+	(let* ((margin 1)
+		(fill-column (max (- fill-column margin) 0)))
 	  (fill-region (point-min) (point-max))
 	  (goto-char (point-min))
 	  (while (and (zerop (forward-line 1)) (not (looking-at "^$")))
@@ -764,7 +764,7 @@ What browser is called is depending on
 	(when (string-match "^image/" (mu4e-message-part-field part :mime-type))
 	  (let ((imgfile (mu4e-message-part-field part :temp)))
 	    (when (and imgfile (file-exists-p imgfile))
-	      (save-excursion
+ 	      (save-excursion
 		(goto-char (point-max))
 		(mu4e-display-image imgfile
 		  mu4e-view-image-max-width