* cosmetics

This commit is contained in:
djcb
2012-04-28 13:47:13 +03:00
parent 99c1042769
commit 63711fd046
2 changed files with 53 additions and 54 deletions

View File

@ -780,8 +780,8 @@ current window. "
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(erase-buffer) (erase-buffer)
(insert (propertize "Waiting for message..." (insert (propertize "Waiting for message..."
'face 'mu4e-system-face 'intangible t))) 'face 'mu4e-system-face 'intangible t))
(mu4e~proc-view docid))) (mu4e~proc-view docid))))
(defun mu4e~hdrs-kill-buffer-and-window () (defun mu4e~hdrs-kill-buffer-and-window ()
"Quit the message view and return to the main view." "Quit the message view and return to the main view."

View File

@ -196,20 +196,16 @@ based on the settings of `mu4e~view-wrap-lines' and
As a side-effect, a message that is being viewed loses its 'unread' As a side-effect, a message that is being viewed loses its 'unread'
marking if it still had that." marking if it still had that."
(let ((buf (get-buffer-create mu4e-view-buffer-name)) (let ((buf (get-buffer-create mu4e-view-buffer-name)))
(inhibit-read-only t))
(with-current-buffer buf (with-current-buffer buf
(setq mu4e-view-buffer buf) (let ((inhibit-read-only t))
(erase-buffer) (setq ;; buffer local
(insert (mu4e-view-message-text msg))
;; initialize view-mode
(mu4e-view-mode)
(setq ;; these are buffer-local
buffer-read-only t
mu4e-current-msg msg mu4e-current-msg msg
mu4e~view-hdrs-buffer hdrsbuf mu4e~view-hdrs-buffer hdrsbuf
mu4e~view-link-map (make-hash-table :size 32 :rehash-size 2 :weakness nil)) mu4e-view-buffer buf)
(erase-buffer)
(insert (mu4e-view-message-text msg))
(switch-to-buffer buf) (switch-to-buffer buf)
(goto-char (point-min)) (goto-char (point-min))
@ -228,7 +224,9 @@ marking if it still had that."
;; no use in trying to set flags again ;; no use in trying to set flags again
(unless update (unless update
(mu4e~view-mark-as-read-maybe))))) (mu4e~view-mark-as-read-maybe)))
(mu4e-view-mode))))
(defun mu4e~view-construct-header (key val &optional dont-propertize-val) (defun mu4e~view-construct-header (key val &optional dont-propertize-val)
@ -250,7 +248,6 @@ DONT-PROPERTIZE-VAL is non-nil, do not add text-properties to VAL."
(buffer-string)) (buffer-string))
"")) ""))
(defun mu4e~view-construct-contacts (msg field) (defun mu4e~view-construct-contacts (msg field)
"Add a header for a contact field (ie., :to, :from, :cc, :bcc)." "Add a header for a contact field (ie., :to, :from, :cc, :bcc)."
(let* ((lst (plist-get msg field)) (let* ((lst (plist-get msg field))
@ -558,6 +555,8 @@ Seen; if the message is not New/Unread, do nothing."
number them so they can be opened using `mu4e-view-go-to-url'." number them so they can be opened using `mu4e-view-go-to-url'."
(let ((num 0)) (let ((num 0))
(save-excursion (save-excursion
(setq mu4e~view-link-map ;; buffer local
(make-hash-table :size 32 :rehash-size 2 :weakness nil))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward mu4e~view-url-regexp nil t) (while (re-search-forward mu4e~view-url-regexp nil t)
(let ((url (match-string 0)) (let ((url (match-string 0))