* cosmetics

This commit is contained in:
djcb
2013-10-14 22:43:56 +03:00
parent cf4c658223
commit 020a13dbd4
2 changed files with 12 additions and 10 deletions

View File

@ -37,9 +37,12 @@
(defcustom mu4e-html2text-command nil (defcustom mu4e-html2text-command nil
"Shell command that converts from html to plain text. "Shell command that converts from html to plain text.
The command has to read html from stdin and output plain text on The command has to read html from stdin and output plain text on
stdout. If this is not defined, the emacs `html2text' tool will stdout. If this is not defined, the emacs `html2text' tool will be
be used when faced with html-only message. If you use htmltext, used when faced with html-only messages. If you use htmltext, it's
it's recommended you use \"html2text -utf8 -width 72\"." recommended you use \"html2text -utf8 -width 72\".
Alternatives are the python-based html2markdown, w3m and on MacOS
you may want to use textutil."
:type 'string :type 'string
:group 'mu4e-view :group 'mu4e-view
:safe 'stringp) :safe 'stringp)
@ -53,8 +56,8 @@ is always used."
(defcustom mu4e-view-html-plaintext-ratio-heuristic 10 (defcustom mu4e-view-html-plaintext-ratio-heuristic 10
"Ratio between the length of the html and the plain text part "Ratio between the length of the html and the plain text part
under which mu4e will consider the plain text part to be below which mu4e will consider the plain text part to be 'This
'This messages requires html' text bodies." messages requires html' text bodies."
:type 'integer :type 'integer
:group 'mu4e-view) :group 'mu4e-view)
@ -120,7 +123,7 @@ Thus, function will return nil for empty lists, non-existing body-txt or body-ht
val) val)
((member field '(:docid :size)) ((member field '(:docid :size))
0) ;; numeric type: nil -> 0 0) ;; numeric type: nil -> 0
(t (t
val)))) ;; otherwise, just return nil val)))) ;; otherwise, just return nil
(defsubst mu4e-message-has-field (msg field) (defsubst mu4e-message-has-field (msg field)
@ -132,7 +135,7 @@ Thus, function will return nil for empty lists, non-existing body-txt or body-ht
the headers buffer or the view buffer, or nil if there is no such the headers buffer or the view buffer, or nil if there is no such
message. If optional NOERROR is non-nil, do not raise an error when message. If optional NOERROR is non-nil, do not raise an error when
there is no message at point." there is no message at point."
(let ((msg (or (get-text-property (point) 'msg) mu4e~view-msg))) (let ((msg (or (get-text-property (point) 'msg) mu4e~view-msg)))
(if msg (if msg
msg msg
(unless noerror (mu4e-warn "No message at point"))))) (unless noerror (mu4e-warn "No message at point")))))
@ -213,7 +216,7 @@ match."
(let ((name (car ct)) (email (cdr ct))) (let ((name (car ct)) (email (cdr ct)))
(or (or
(and name (string-match rx name)) (and name (string-match rx name))
(and email (string-match rx email))))) (and email (string-match rx email)))))
(mu4e-message-field msg cfield)))) (mu4e-message-field msg cfield))))
(defun mu4e-message-contact-field-matches-me (msg cfield) (defun mu4e-message-contact-field-matches-me (msg cfield)

View File

@ -1197,7 +1197,7 @@ comparison with the html part@footnote{this is for the case where the
text-part only warns that you should use the html-version}, @t{mu4e} tries to text-part only warns that you should use the html-version}, @t{mu4e} tries to
convert the html into plain-text for display. The default way to do that is to convert the html into plain-text for display. The default way to do that is to
use the @command{emacs} built-in @code{html2text} function. However, you can use the @command{emacs} built-in @code{html2text} function. However, you can
set the variable @code{mu4e-html2text-command} to use some external program set the variable @code{mu4e-html2text-command} to some external program
instead. This program is expected to take html from standard input and write instead. This program is expected to take html from standard input and write
plain text in @t{UTF-8} encoding on standard output. plain text in @t{UTF-8} encoding on standard output.
@ -1224,7 +1224,6 @@ On MacOS, there is a program called @t{textutil} as yet another alternative:
"textutil -stdin -format html -convert txt -stdout") "textutil -stdin -format html -convert txt -stdout")
@end lisp @end lisp
@node MSGV Crypto @node MSGV Crypto
@section Crypto @section Crypto