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

* cosmetics

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
emacs/mu4e-hdrs.el
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."

87
emacs/mu4e-view.el
View File

@ -196,60 +196,57 @@ 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)) mu4e-current-msg msg
mu4e~view-hdrs-buffer hdrsbuf
mu4e-view-buffer buf)
;; initialize view-mode (erase-buffer)
(mu4e-view-mode) (insert (mu4e-view-message-text msg))
(setq ;; these are buffer-local
buffer-read-only t
mu4e-current-msg msg
mu4e~view-hdrs-buffer hdrsbuf
mu4e~view-link-map (make-hash-table :size 32 :rehash-size 2 :weakness nil))
(switch-to-buffer buf) (switch-to-buffer buf)
(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)
(unless update (unless update
;; if we're showing the message for the first time, use the values of ;; if we're showing the message for the first time, use the values of
;; user-settable variables `mu4e~view-wrap-lines' and ;; user-settable variables `mu4e~view-wrap-lines' and
;; `mu4e~view-hide-cited' to determine whether we should wrap/hide ;; `mu4e~view-hide-cited' to determine whether we should wrap/hide
(progn (progn
(when mu4e~view-lines-wrapped (mu4e~view-wrap-lines)) (when mu4e~view-lines-wrapped (mu4e~view-wrap-lines))
(when mu4e~view-cited-hidden (mu4e~view-hide-cited)))) (when mu4e~view-cited-hidden (mu4e~view-hide-cited))))
;; 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)
"Return header KEY with value VAL if VAL is non-nil. If "Return header KEY with value VAL if VAL is non-nil. If
DONT-PROPERTIZE-VAL is non-nil, do not add text-properties to VAL." DONT-PROPERTIZE-VAL is non-nil, do not add text-properties to VAL."
(if val (if val
(with-temp-buffer (with-temp-buffer
(insert (propertize key 'face 'mu4e-view-header-key-face) ": " (insert (propertize key 'face 'mu4e-view-header-key-face) ": "
(if dont-propertize-val (if dont-propertize-val
val val
(propertize val 'face 'mu4e-view-header-value-face)) "\n") (propertize val 'face 'mu4e-view-header-value-face)) "\n")
;; 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 following lines with positions ;; we can indent following lines with positions
(let*((margin 1) (fill-column (- fill-column margin))) (let*((margin 1) (fill-column (- fill-column margin)))
(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 "^$")))
(indent-to-column margin))) (indent-to-column margin)))
(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)."
@ -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))