Merge branch 'master' of github.com:djcb/mu
This commit is contained in:
djcb
@ -326,7 +326,7 @@ appear on disk."
|
||||
mu4e~compose-buffer-max-name-length
|
||||
nil nil t)))))
|
||||
|
||||
(defun mu4e~compose-handler (compose-type &optional original-msg includes)
|
||||
(defun* mu4e~compose-handler (compose-type &optional original-msg includes)
|
||||
"Create a new draft message, or open an existing one.
|
||||
|
||||
COMPOSE-TYPE determines the kind of message to compose and is a
|
||||
@ -352,7 +352,10 @@ tempfile)."
|
||||
(run-hooks 'mu4e-compose-pre-hook)
|
||||
|
||||
;; this opens (or re-opens) a messages with all the basic headers set.
|
||||
(mu4e-draft-open compose-type original-msg)
|
||||
(condition-case nil
|
||||
(mu4e-draft-open compose-type original-msg)
|
||||
(quit (kill-buffer) (message "[mu4e] Operation aborted")
|
||||
(return-from mu4e~compose-handler)))
|
||||
;; insert mail-header-separator, which is needed by message mode to separate
|
||||
;; headers and body. will be removed before saving to disk
|
||||
(mu4e~draft-insert-mail-header-separator)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
("boost-announce.lists.boost.org" . "BoostA")
|
||||
("boost-interest.lists.boost.org" . "BoostI")
|
||||
("conkeror.mozdev.org" . "Conkeror")
|
||||
("curl-library.cool.haxx.se" . "LibCurl")
|
||||
("crypto-gram-list.schneier.com " . "CryptoGr")
|
||||
("dbus.lists.freedesktop.org" . "DBus")
|
||||
("desktop-devel-list.gnome.org" . "GnomeDT")
|
||||
|
||||
@ -64,11 +64,9 @@
|
||||
"Major mode for the mu4e main screen.
|
||||
\\{mu4e-main-mode-map}."
|
||||
(use-local-map mu4e-main-mode-map)
|
||||
(setq
|
||||
truncate-lines t
|
||||
overwrite-mode 'overwrite-mode-binary
|
||||
revert-buffer-function 'mu4e:main-revert-buffer
|
||||
))
|
||||
(setq truncate-lines t
|
||||
overwrite-mode 'overwrite-mode-binary)
|
||||
(set (make-local-variable 'revert-buffer-function) #'mu4e:main-revert-buffer))
|
||||
|
||||
|
||||
(defun mu4e~main-action-str (str &optional func-or-shortcut)
|
||||
|
||||
@ -138,7 +138,7 @@ The following marks are available, and the corresponding props:
|
||||
`flag' n mark this message for flagging
|
||||
`move' y move the message to some folder
|
||||
`read' n mark the message as read
|
||||
`trash' y thrash the message to some folder
|
||||
`trash' y trash the message to some folder
|
||||
`unflag' n mark this message for unflagging
|
||||
`untrash' n remove the 'trashed' flag from a message
|
||||
`unmark' n unmark this message
|
||||
@ -286,7 +286,7 @@ user which one)."
|
||||
mu4e~mark-map))))
|
||||
|
||||
(defun mu4e~mark-check-target (target)
|
||||
"Check if the target exists if not, offer to create it."
|
||||
"Check if the target exists; if not, offer to create it."
|
||||
(let ((fulltarget (concat mu4e-maildir target)))
|
||||
(if (not (mu4e-create-maildir-maybe fulltarget))
|
||||
(mu4e-error "Target dir %s does not exist " fulltarget)
|
||||
@ -298,9 +298,9 @@ user which one)."
|
||||
After the actions have been executed succesfully, the affected
|
||||
messages are *hidden* from the current header list. Since the
|
||||
headers are the result of a search, we cannot be certain that the
|
||||
messages no longer matches the current one - to get that
|
||||
messages no longer match the current one - to get that
|
||||
certainty, we need to rerun the search, but we don't want to do
|
||||
that automatically, as it may be too slow and/or break the users
|
||||
that automatically, as it may be too slow and/or break the user's
|
||||
flow. Therefore, we hide the message, which in practice seems to
|
||||
work well.
|
||||
|
||||
|
||||
@ -597,6 +597,7 @@ FUNC should be a function taking two arguments:
|
||||
;; misc
|
||||
(define-key map "w" 'visual-line-mode)
|
||||
(define-key map "h" 'mu4e-view-toggle-hide-cited)
|
||||
(define-key map (kbd "M-q") 'mu4e-view-fill-long-lines)
|
||||
|
||||
;; next 3 only warn user when attempt in the message view
|
||||
(define-key map "u" 'mu4e-view-unmark)
|
||||
@ -909,6 +910,28 @@ Add this function to `mu4e-view-mode-hook' to enable this feature."
|
||||
(overlay-put ov 'face 'mu4e-region-code))
|
||||
(setq beg nil end nil))))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Wash functions
|
||||
(defun mu4e-view-fill-long-lines ()
|
||||
"Fill lines that are wider than the window width or `fill-column'."
|
||||
(interactive)
|
||||
(with-current-buffer mu4e~view-buffer
|
||||
(save-excursion
|
||||
(let ((inhibit-read-only t)
|
||||
(width (window-width (get-buffer-window (current-buffer)))))
|
||||
(save-restriction
|
||||
(message-goto-body)
|
||||
(while (not (eobp))
|
||||
(end-of-line)
|
||||
(when (>= (current-column) (min fill-column width))
|
||||
(narrow-to-region (min (1+ (point)) (point-max))
|
||||
(point-at-bol))
|
||||
(let ((goback (point-marker)))
|
||||
(fill-paragraph nil)
|
||||
(goto-char (marker-position goback)))
|
||||
(widen))
|
||||
(forward-line 1)))))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; attachment handling
|
||||
(defun mu4e~view-get-attach-num (prompt msg &optional multi)
|
||||
|
||||
@ -810,7 +810,7 @@ W toggle include-related
|
||||
marking
|
||||
-------
|
||||
d mark for moving to the trash folder
|
||||
= mark for remove thrash flags ('untrash')
|
||||
= mark for removing trash flag ('untrash')
|
||||
DEL,D mark for complete deletion
|
||||
m mark for moving to another maildir folder
|
||||
r mark for refiling
|
||||
@ -1076,7 +1076,7 @@ M-right next query
|
||||
marking
|
||||
-------
|
||||
d mark for moving to the trash folder
|
||||
= mark for remove thrash flags ('untrash')
|
||||
= mark for removing trash flag ('untrash')
|
||||
DEL,D mark for complete deletion
|
||||
m mark for moving to another maildir folder
|
||||
r mark for refiling
|
||||
@ -1839,12 +1839,12 @@ previous/next queries, you can use @kbd{M-x mu4e-headers-forget-queries}.
|
||||
It can be useful to narrow existing search results, that is, to add some
|
||||
clauses to the current query to match fewer messages.
|
||||
|
||||
For example, suppose you're looking at the some mailing list, perhaps by
|
||||
For example, suppose you're looking at some mailing list, perhaps by
|
||||
jumping to a maildir (@kbd{M-x mu4e-headers-jump-to-maildir}, @key{j}) or
|
||||
because you followed some bookmark (@kbd{M-x mu4e-headers-search-bookmark},
|
||||
@key{b}). Now, you want to narrow things down to only those messages that have
|
||||
attachments.
|
||||
1
|
||||
|
||||
This is when @kbd{M-x mu4e-headers-search-narrow} (@key{/}) comes in handy. It
|
||||
asks for an additional search pattern, which is appended to the current search
|
||||
query, in effect getting you the subset of the currently shown headers that
|
||||
@ -3234,10 +3234,10 @@ value)} pairs:
|
||||
("Account2"
|
||||
(mu4e-sent-folder "/Account2/Saved Items")
|
||||
(mu4e-drafts-folder "/Account2/Drafts")
|
||||
(user-mail-address "my.address@@account2.tld)
|
||||
(smtpmail-default-smtp-server "smtp.account2.tld)
|
||||
(user-mail-address "my.address@@account2.tld")
|
||||
(smtpmail-default-smtp-server "smtp.account2.tld")
|
||||
(smtpmail-local-domain "account2.tld")
|
||||
(smtpmail-smtp-server "smtp.account2.tld)
|
||||
(smtpmail-smtp-server "smtp.account2.tld")
|
||||
(smtpmail-stream-type starttls)
|
||||
(smtpmail-smtp-service 587))))
|
||||
@end lisp
|
||||
|
||||
Reference in New Issue
Block a user