X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Forg-mode-configuration.el;h=d39e8c984a519c50375d50da8bee81b69a2a9b44;hb=34f9dd4d0b45dd5e0dcc987d2fcf147fc4ed5a9c;hp=0af973acbf05482bd1202a46a2c3612f346618f4;hpb=9fc89af6c7a27cff07b3c25fa5a29497d799305f;p=lib.git

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index 0af973a..d39e8c9 100644
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -97,6 +97,7 @@
 (setq org-agenda-files
       (quote ("~/projects/org-notes/debbugs.org"
 	      "~/projects/org-notes/notes.org"
+	      "~/projects/org-notes/holidays.org"
 	      "~/projects/org-notes/refile.org"
 	      "~/projects/org-notes/diary.org"
 	      "~/projects/org-notes/ool.org"
@@ -132,8 +133,8 @@
 (setq org-default-notes-file "~/projects/org-notes/notes.org")
 (setq org-id-link-to-org-use-id t)
 (setq org-capture-templates  ;; mail-specific note template, identified by "m"
-      '(("m" "Mail" entry (file+headline "~/projects/org-notes/refile.org" "Mail")
-         "* %?\n\n  Source: %u, %c\n  %i")
+      '(("m" "Mail" entry (file "~/projects/org-notes/refile.org")
+         "* %?\n\n  Source: %u, [[%:link][%:description]]\n  %:initial")
         ("t" "todo" entry (file "~/projects/org-notes/refile.org")
          "* TODO %?\n  :PROPERTIES:\n  :END:\n  :LOGBOOK:\n  :END:\n%U\n%a\n" :clock-in t :clock-resume t)
         ("r" "respond" entry (file "~/projects/org-notes/refile.org")
@@ -450,7 +451,7 @@ Maildir, or by Message-ID."
 
 
 (setq-default org-mobile-directory "/linnode.donarmstrong.com:/sites/dav.donarmstrong.com/root/org/")
-(when (string= system-name "linnode.donarmstrong.com")
+(when (string= system-name "linnode")
   (setq-default org-mobile-directory "/sites/dav.donarmstrong.com/root/org/"))
 (setq-default org-directory "/home/don/org-mode/")
 (setq-default org-mobile-inbox-for-pull "/home/don/org-mode/from-mobile.org")