alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e: fix display of images

Browse Source
This commit is contained in:
djcb
2013-10-13 23:24:56 +03:00
parent 92158cfdd4
commit 8be5e92709
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mu4e/mu4e-utils.el
View File

@ -975,15 +975,15 @@ and MAXHEIGHT are ignored."
(create-image imgpath 'imagemagick nil :width maxwidth) (create-image imgpath 'imagemagick nil :width maxwidth)
(create-image imgpath 'imagemagick)) (create-image imgpath 'imagemagick))
(create-image imgpath)))) (create-image imgpath))))
;;(message "DISPLAY: %S %S" imgpath img)
(when img (when img
(insert "\n") (save-excursion
(let ((size (image-size img))) ;; inspired by gnus.. (insert "\n")
(insert-char ?\n (let ((size (image-size img))) ;; inspired by gnus..
(max 0 (round (- (window-height) (or maxheight (cdr size)) 1) 2))) (insert-char ?\n
(insert-char ?\ (max 0 (round (- (window-height) (or maxheight (cdr size)) 1) 2)))
(max 0 (round (- (window-width) (or maxwidth (car size))) 2))) (insert-char ?\.
(insert-image img))))) (max 0 (round (- (window-width) (or maxwidth (car size))) 2)))
(insert-image img))))))
(defun mu4e-hide-other-mu4e-buffers () (defun mu4e-hide-other-mu4e-buffers ()

12
mu4e/mu4e-view.el
View File

@ -239,13 +239,13 @@ marking if it still had that."
(with-current-buffer buf (with-current-buffer buf
(switch-to-buffer buf) (switch-to-buffer buf)
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(erase-buffer) (erase-buffer)
(insert (mu4e-view-message-text msg)) (insert (mu4e-view-message-text msg))
(goto-char (point-min)) (goto-char (point-min))
(mu4e~view-fontify-cited) (mu4e~view-fontify-cited)
(mu4e~view-fontify-footer) (mu4e~view-fontify-footer)
(mu4e~view-make-urls-clickable) (mu4e~view-make-urls-clickable)
(mu4e~view-show-images-maybe msg) (mu4e~view-show-images-maybe msg)
(if embedded (if embedded
(local-set-key "q" 'kill-buffer-and-window) (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) (unless (eq major-mode 'mu4e-view-mode)
(mu4e-view-mode)) (mu4e-view-mode))
(setq ;; buffer local
(setq ;; buffer local
mu4e~view-msg msg mu4e~view-msg msg
mu4e~view-headers-buffer headersbuf) mu4e~view-headers-buffer headersbuf)
@ -283,7 +282,8 @@ add text-properties to VAL."
(when mu4e-view-fill-headers (when mu4e-view-fill-headers
;; temporarily set the fill column <margin> positions to the right, so ;; temporarily set the fill column <margin> positions to the right, so
;; we can indent the following lines correctly ;; 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)) (fill-region (point-min) (point-max))
(goto-char (point-min)) (goto-char (point-min))
(while (and (zerop (forward-line 1)) (not (looking-at "^$"))) (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)) (when (string-match "^image/" (mu4e-message-part-field part :mime-type))
(let ((imgfile (mu4e-message-part-field part :temp))) (let ((imgfile (mu4e-message-part-field part :temp)))
(when (and imgfile (file-exists-p imgfile)) (when (and imgfile (file-exists-p imgfile))
(save-excursion (save-excursion
(goto-char (point-max)) (goto-char (point-max))
(mu4e-display-image imgfile (mu4e-display-image imgfile
mu4e-view-image-max-width mu4e-view-image-max-width