quote properly

[notmuch-wiki] / emacstips.mdwn

diff --git a/emacstips.mdwn b/emacstips.mdwn
index 84d616189ced7b3129ed32bfe2d5c3f3b6722fc4..11495b2f98add6a1cd45b3f154c584581f1ba1d9 100644 (file)
--- a/emacstips.mdwn
+++ b/emacstips.mdwn
@@ -276,8 +276,6 @@ the rest will go to the default account.
 
 ## sending mail using smtpmail
 
-another option is to use remov
-
 <!-- By default message mode will use the system `sendmail` command to send
 mail. However, on a typical desktop machine there may not be local SMTP
 daemon running (nor it is configured to send mail outside of the system). -->
@@ -286,33 +284,62 @@ If setting up local `sendmail` or `msmtp` is not feasible or desirable,
 the Emacs `smtpmail` package can be used to send email by talking to remote
 SMTP server via TCP connection. It is pretty easy to configure:
 
-1. `M-x customize-group smtpmail`
+1. Emacs variable `message-send-mail-function` has not been set
+
+   Initially, Emacs variable `message-send-mail-function` has value of
+   `sendmail-query-once`. When (notmuch) message mode is about to send email,
+   `sendmail-query-once` will ask how emacs should send email. Typing `smtp`
+   will configure `smtpmail` and Emacs may prompt for SMTP settings.
+
+1. `M-x customize-group RET smtpmail`
 
-   as as minimum, 'Smtpmail Smtp Server' needs to be set.
+   As a minimum, 'Smtpmail Smtp Server' needs to be set.
 
-   - then continue with `M-x load-library message` and
-     `M-x customize-variable message-send-mail-function`
-     -- choose `message-smtpmail-send-it` for that.
+   After doing that, continue with `M-x load-library RET message` and
+   `M-x customize-variable RET message-send-mail-function`.
+   In the customization buffer select `message-smtpmail-send-it`.
 
 1. Set some variables in .emacs or in [notmuch init file](/notmuch-emacs#notmuch_init_file)
 
-      (setq smtpmail-smtp-server "smtp.server.tld" ;; <-- edit this !!!
-      ;; smtpmail-smtp-service 25 ;; 25 is default -- uncomment and edit if needed
-      ;; smtpmail-stream-type 'starttls
-      ;; smtpmail-debug-info t
-      ;; smtpmail-debug-verb t
-         message-send-mail-function 'message-smtpmail-send-it)
+        (setq smtpmail-smtp-server "smtp.server.tld" ;; <-- edit this !!!
+        ;;    smtpmail-smtp-service 25 ;; 25 is default -- uncomment and edit if needed
+        ;;    smtpmail-stream-type 'starttls
+        ;;    smtpmail-debug-info t
+        ;;    smtpmail-debug-verb t
+              message-send-mail-function 'message-smtpmail-send-it)
+
+Note that emacs 24 or newer is required for `smtpmail-stream-type`
+(and smtp authentication) to be effective.
 
 More information for smtpmail is available:
 
 * In Emacs: `M-x info-display-manual smtpmail`
-* At http://www.emacswiki.org/emacs/SendingMail
+* [EmacsWiki Page](http://www.emacswiki.org/emacs/SendingMail)
 
 
 ## <span id="address_completion">Address completion when composing</span>
 
 There are currently three solutions to this:
 
+### notmuch address
+
+Starting with Notmuch 0.21, there is a builtin command to perform
+autocompletion directly within Notmuch. Starting with 0.22, it is
+configured by default, so if you have previously configured another
+completion mechanism, you may want to try out the new internal
+method. Use `M-x customize-variable RET notmuch-address-command` and
+reset the value to "internal address completion" (`'internal` in
+lisp).
+
+If you are not yet running 0.22, you can still use it by adding a
+wrapper around the command called, say, `notmuch-address`:
+
+    #!/bin/sh
+    exec notmuch address from:"$*"
+
+Then you can set the `notmuch-address-command` to `notmuch-address`
+(if it is in your `$PATH` of course, otherwise use an absolute path).
+
 ### bbdb
 
 [bbdb](http://bbdb.sourceforge.net) is a contact database for emacs
@@ -443,7 +470,7 @@ part.
 
 Encrypted and signed mime messages can be read and verified with:
 
-        (notmuch-crypto-process-mime t)
+        (setq notmuch-crypto-process-mime t)
 
 Decrypting or verifying inline pgp messages can be done by selecting
 an the inline pgp area and and using: