X-Git-Url: https://projects.mako.cc/source/org-mutt/blobdiff_plain/c05f4006394797de7cc9e1ecada95b02bb419bdd..HEAD:/emacs-conf.sample

diff --git a/emacs-conf.sample b/emacs-conf.sample
index f1415dd..e07df5e 100644
--- a/emacs-conf.sample
+++ b/emacs-conf.sample
@@ -1,23 +1,32 @@
 ;; standard org <-> remember stuff, RTFM
-(org-remember-insinuate)
+(require 'org-capture)
+
 (setq org-default-notes-file "~/org/gtd.org")
-(setq org-remember-templates  ;; mail-specific note template, identified by "m"
-      '(("Mail" ?m "* %?\n\n  Source: %u, %c\n	%i" nil)))
 
+(setq org-capture-templates
+      (quote
+       (("m"
+         "Mail"
+         entry
+         (file+headline "~/org/gtd.org" "Incoming")
+         "* TODO %^{Title}\n\n  Source: %u, %c\n\n  %i"
+         :empty-lines 1)
+        ;; ... more templates here ...
+        )))
 ;; ensure that emacsclient will show just the note to be edited when invoked
 ;; from Mutt, and that it will shut down emacsclient once finished;
 ;; fallback to legacy behavior when not invoked via org-protocol.
-(add-hook 'org-remember-mode-hook 'delete-other-windows)
+(add-hook 'org-capture-mode-hook 'delete-other-windows)
 (setq my-org-protocol-flag nil)
-(defadvice org-remember-finalize (after delete-frame-at-end activate)
+(defadvice org-capture-finalize (after delete-frame-at-end activate)
   "Delete frame at remember finalization"
   (progn (if my-org-protocol-flag (delete-frame))
-	 (setq my-org-protocol-flag nil)))
-(defadvice org-remember-kill (after delete-frame-at-end activate)
+         (setq my-org-protocol-flag nil)))
+(defadvice org-capture-kill (after delete-frame-at-end activate)
   "Delete frame at remember abort"
   (progn (if my-org-protocol-flag (delete-frame))
-	 (setq my-org-protocol-flag nil)))
-(defadvice org-protocol-remember (before set-org-protocol-flag activate)
+         (setq my-org-protocol-flag nil)))
+(defadvice org-protocol-capture (before set-org-protocol-flag activate)
   (setq my-org-protocol-flag t))
 
 (defun open-mail-in-mutt (message)