Revert "Ensure mu4e-view-mode-hook run after text insertion"

This commit is contained in:
Dirk-Jan C. Binnema 2017-11-04 13:36:43 +02:00 committed by GitHub
parent 6a0654c91b
commit d87b97e0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions

View File

@ -311,27 +311,26 @@ marking if it still had that."
(buf
(if embedded
(mu4e~view-embedded-winbuf)
(get-buffer-create mu4e~view-buffer-name)))
(insert-it (or embedded (not (mu4e~view-mark-as-read-maybe msg)))))
(get-buffer-create mu4e~view-buffer-name))))
(with-current-buffer buf
(unless (eq major-mode 'mu4e-view-mode)
(mu4e-view-mode))
(setq mu4e~view-msg msg)
(switch-to-buffer buf)
;; When MSG is unread, mu4e~view-mark-as-read-maybe will trigger
;; another call to mu4e-view (via mu4e~headers-update-handler as
;; the reply handler to mu4e~proc-move)
(let ((inhibit-read-only t))
(when insert-it
(when (or embedded (not (mu4e~view-mark-as-read-maybe msg)))
(let ((inhibit-read-only t))
(erase-buffer)
(mu4e~delete-all-overlays)
(insert (mu4e-view-message-text msg))
(goto-char (point-min))
(mu4e~fontify-cited)
(mu4e~fontify-signature)
(mu4e~view-make-urls-clickable)
(mu4e~view-show-images-maybe msg)
(when embedded (local-set-key "q" 'kill-buffer-and-window)))
(unless (eq major-mode 'mu4e-view-mode)
(mu4e-view-mode))
(setq mu4e~view-msg msg)
(and insert-it (mu4e~view-make-urls-clickable))))))
(when embedded (local-set-key "q" 'kill-buffer-and-window)))))))
(defun mu4e~view-get-property-from-event (prop)
"Get the property PROP at point, or the location of the mouse.