Remove dependency on desktop-registry

This commit is contained in:
Tom Willemse 2015-06-21 12:46:13 +02:00
parent 143f86da3f
commit caf5b50e0e

View file

@ -111,16 +111,6 @@ predecessor if there is a non-DONE sibling defined before it."
(oni:org-heading-has-predecessor-p)) (oni:org-heading-has-predecessor-p))
(oni:next-heading-position)))) (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-cmp-user-defined (lambda (a b) 1))
(setq org-agenda-prefix-format (setq org-agenda-prefix-format
'((agenda . " %i %-12:c%?-12t% s") '((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-default-notes-file (concat org-directory "/org"))
(setq org-capture-templates (setq org-capture-templates
`(("t" "Task" entry (file+headline "~/documents/org/tasks" "Inbox") `(("t" "Task" entry (file+headline "~/documents/org/tasks" "Inbox")
"* TODO %? %(org-init-get-tag-name)" "* TODO %?"
:empty-lines 1) :empty-lines 1)
("T" "Linked task" entry (file "~/documents/org/tasks" "Inbox") ("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) :empty-lines 1)
("a" "Appointment" entry (file "~/documents/org/tasks" "Inbox") ("a" "Appointment" entry (file "~/documents/org/tasks" "Inbox")
"* %?\n %^T\n\n %a" "* %?\n %^T\n\n %a"