From caf5b50e0e097b3884a47c35b206c24a01460e44 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 21 Jun 2015 12:46:13 +0200
Subject: Remove dependency on desktop-registry

---
 emacs/.emacs.d/site-lisp/org-init.el | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'emacs/.emacs.d/site-lisp/org-init.el')

diff --git a/emacs/.emacs.d/site-lisp/org-init.el b/emacs/.emacs.d/site-lisp/org-init.el
index 124d49d..a738f81 100644
--- a/emacs/.emacs.d/site-lisp/org-init.el
+++ b/emacs/.emacs.d/site-lisp/org-init.el
@@ -111,16 +111,6 @@ predecessor if there is a non-DONE sibling defined before it."
               (oni:org-heading-has-predecessor-p))
       (oni:next-heading-position))))
 
-(defun org-init-get-tag-name ()
-  "Get the name for a new tag for the currently loaded desktop."
-  (let ((dname (desktop-registry-current-desktop)))
-    (if dname
-        (let ((tag (read-string "Tag(s): " (tagify dname))))
-          (if (not (string= tag ""))
-              (format ":%s:" tag)
-            ""))
-      "")))
-
 (setq org-agenda-cmp-user-defined (lambda (a b) 1))
 (setq org-agenda-prefix-format
       '((agenda . " %i %-12:c%?-12t% s")
@@ -138,10 +128,10 @@ predecessor if there is a non-DONE sibling defined before it."
 (setq org-default-notes-file (concat org-directory "/org"))
 (setq org-capture-templates
       `(("t" "Task" entry (file+headline "~/documents/org/tasks" "Inbox")
-         "* TODO %?  %(org-init-get-tag-name)"
+         "* TODO %?"
          :empty-lines 1)
         ("T" "Linked task" entry (file "~/documents/org/tasks" "Inbox")
-         "* TODO %?  %(org-init-get-tag-name)\n\n  %a"
+         "* TODO %?\n\n  %a"
          :empty-lines 1)
         ("a" "Appointment" entry (file "~/documents/org/tasks" "Inbox")
          "* %?\n  %^T\n\n  %a"
-- 
cgit v1.2.3-54-g00ecf