X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=emacstips.mdwn;h=952a62c21d28202d8f39298f74e3e9b0c5ea3ec4;hb=134b7f3a1b82828456c4a42c8140573f5b8ff892;hp=823cbd48753a5b3308689f8e29553468de1dce9b;hpb=50f17e824373831a86eb15735c72382512b0ee39;p=notmuch-wiki

diff --git a/emacstips.mdwn b/emacstips.mdwn
index 823cbd4..952a62c 100644
--- a/emacstips.mdwn
+++ b/emacstips.mdwn
@@ -299,7 +299,7 @@ an external browser. This can be done by `(notmuch-show-view-part)`, bound to
 This command will try to view the message part the point is on with an
 external viewer. The mime-type of the part will determine what viewer
 will be used. Typically a 'text/html' part will be send to your
-browser. 
+browser.
 
 The configuration for this is kept in so called `mailcap`
 files. (typically the file is `~/.mailcap` or `/etc/mailcap`) If the
@@ -664,12 +664,12 @@ See also the **Usage:** section in `gnus-alias.el`.
 ## Multiple identities (and more) with message-templ
 
 Another option for multiple identities is
-[message-templ](http://pivot.cs.unb.ca/git?p=message-templ.git;a=summary)
+[message-templ](http://git.tethera.net/message-templ.git)
 (also a available in marmalade).  This provides roughly the same
 facilities as wanderlust's template facility.
 
 See
-[example.emacs.el](http://pivot.cs.unb.ca/git?p=message-templ.git;a=blob;f=example.emacs.el;hb=HEAD)
+[example.emacs.el](https://git.tethera.net/message-templ.git/tree/example.emacs.el)
 for some simple examples of usage.
 
 ## Resending (or bouncing) messages
@@ -803,19 +803,29 @@ In NixOS, using `emacsWithPackages (epkgs: [ epkgs.orgPackages.org-plus-contrib
 
     (loop for p in load-path
           do (if (file-accessible-directory-p p)
-                 (let ((m (directory-files-recursively p "^org-notmuch.el$")))
+                 (let ((m (directory-files-recursively p "^ol-notmuch.el$")))
                       (if m (add-to-list 'load-path (file-name-directory (car m)))))))
 
 Then
 
-    (require 'org-notmuch)
+    (require 'ol-notmuch)
 
 In general it is nice to have a key for org-links (not just for notmuch). For example
 
-    (define-key global-map "\C-cl" 'org-store-link)
+    (define-key global-map "\C-c l" 'org-store-link)
+
+If you're using `use-package` the package can be loaded using the following:
+
+```emacs-lisp
+(use-package ol-notmuch
+  :ensure t
+  :bind
+  ("C-c l" . org-store-link))
+```
 
 Note the package was renamed from `org-notmuch` to `ol-notmuch` in recent
-versions of org-mode, and you might want to `(require 'ol-notmuch)` instead.
+versions of org-mode. If you're using an old version of notmuch you might want
+to `(require 'org-notmuch)` instead.
 
 ## Viewing diffs in notmuch