Merge branch 'master' of github.com:djcb/mu

This commit is contained in:
djcb
2016-03-14 22:56:51 +02:00
2 changed files with 5 additions and 5 deletions

View File

@ -231,7 +231,7 @@ based on `user-full-name' and `user-mail-address'; if the latter is
nil, function returns nil." nil, function returns nil."
(when user-mail-address (when user-mail-address
(if user-full-name (if user-full-name
(format "%s <%s>" user-full-name user-mail-address) (format "%s <%s>" (mu4e~rfc822-quoteit user-full-name) user-mail-address)
(format "%s" user-mail-address)))) (format "%s" user-mail-address))))

View File

@ -747,10 +747,10 @@ Note, `:sortable' does not work for custom header fields.")
(+ (length (mu4e-message-field msg :to)) (+ (length (mu4e-message-field msg :to))
(length (mu4e-message-field msg :cc)))))))) (length (mu4e-message-field msg :cc))))))))
"A list of custom (user-defined) headers. The format is similar "A list of custom (user-defined) headers. The format is similar
to `mu4e-header-info', but addds a :function property, which should to `mu4e-header-info', but adds a :function property, which
point to a function that takes a message p-list as argument, and should point to a function that takes a message p-list as
returns a string. See the default value of `mu4e-header-info-custom argument, and returns a string. See the default value of
for an example.") `mu4e-header-info-custom for an example.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;