nmbug: minor wording updates

[obsolete/notmuch-wiki] / emacstips.mdwn

diff --git a/emacstips.mdwn b/emacstips.mdwn
index 183fef8d48b27c34ee4514cfb0b53ed67370c1a7..ef96e00210a201767b12bb162a4235bef2f8c9f2 100644 (file)
--- a/emacstips.mdwn
+++ b/emacstips.mdwn
@@ -87,7 +87,7 @@ mentioned as script arguments. (Note: The script expects that you have
         #!/bin/sh
         attach_cmds=""
         while [ "$1" ]; do
-            fullpath=$(readlink --canonicalize $1)
+            fullpath=$(readlink --canonicalize "$1")
             attach_cmds="$attach_cmds (mml-attach-file \"$fullpath\")"
             shift
         done
@@ -195,7 +195,7 @@ And version for notmuch 0.12 (not released yet)
             (interactive)
             (notmuch-show-tag-message
               (if (member "deleted" (notmuch-show-get-tags))
-                  "+deleted" "-deleted"))))
+                  "-deleted" "+deleted"))))
 
 ## Restore reply-to-all key binding to 'r'
 
@@ -340,12 +340,16 @@ emacswiki.
 
 ## <span id="address_completion">Address completion when composing</span>
 
-There are currently two solutions to this:
+There are currently three solutions to this:
+
+### bbdb
 
 [bbdb](http://bbdb.sourceforge.net) is a contact database for emacs
 that works quite nicely together with message mode, including
 address autocompletion.
 
+### notmuch database as an address book
+
 You can also use the notmuch database as a mail address book itself.
 To do this you need a command line tool that outputs likely address
 candidates based on a search string.  There are currently three
@@ -374,6 +378,19 @@ You can perform tab-completion using any of these programs. Just add the followi
         (setq notmuch-address-command "/path/to/address_fetching_program")
         (notmuch-address-message-insinuate)
 
+### Google Contacts
+
+[GooBook](http://code.google.com/p/goobook/) is a command-line tool for
+accessing Google Contacts. Install and set it up according to its documentation.
+
+To use GooBook with notmuch, use this wrapper script and set it up like the
+programs above.
+
+        #!/bin/sh
+        goobook query "$*" | sed 's/\(.*\)\t\(.*\)\t.*/\2 \<\1\>/' | sed '/^$/d'
+
+You can add the sender of a message to Google Contacts by piping the message
+(`notmuch-show-pipe-message`) to `goobook add`.
 
 ## How to sign/encrypt messages with gpg
 
@@ -398,7 +415,7 @@ part.
 
 ### Troubleshooting message-mode gpg support
 
-- If you have trouble with expired subkeys, you may have encounted
+- If you have trouble with expired subkeys, you may have encountered
   emacs bug #7931.  This is fixed in git commit 301ea744c on
   2011-02-02.  Note that if you have the Debian package easypg
   installed, it will shadow the fixed version of easypg included with