mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-06 11:55:57 +00:00
Code

Fix bug in getting template from file or function

Browse Source
This commit is contained in:
Carsten Dominik 2010-07-06 12:45:26 +02:00
parent d044ad3f1c
commit 2235ecb422
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lisp/org-capture.el
View File

@ -385,6 +385,7 @@ bypassed."
(error "Abort")) (error "Abort"))
(t (t
(org-capture-set-plist entry) (org-capture-set-plist entry)
(org-capture-get-template)
(org-capture-put :original-buffer orig-buf :annotation annotation (org-capture-put :original-buffer orig-buf :annotation annotation
:initial initial) :initial initial)
(org-capture-put :default-time (org-capture-put :default-time
@ -424,6 +425,25 @@ bypassed."
(error (error
"Could not start the clock in this capture buffer"))))))))))) "Could not start the clock in this capture buffer")))))))))))
(defun org-capture-get-template ()
"Get the template from a file or a function if necessary."
(let ((txt (org-capture-get :template)) file)
(cond
((and (listp txt) (eq (car txt) 'file))
(if (file-exists-p
(setq file (expand-file-name (nth 1 txt) org-directory)))
(setq txt (org-file-contents file))
(setq txt (format "* Template file %s not found" (nth 1 txt)))))
((and (listp txt) (eq (car txt) 'function))
(if (fboundp (nth 1 txt))
(setq txt (funcall (nth 1 txt)))
(setq txt (format "* Template function %s not found" (nth 1 txt)))))
((not txt) (setq txt ""))
((stringp txt))
(t (setq txt "* Invalid capture template")))
(org-capture-put :template txt)))
(defun org-capture-finalize () (defun org-capture-finalize ()
"Finalize the capture process." "Finalize the capture process."
(interactive) (interactive)
@ -661,20 +681,6 @@ already gone."
(target-entry-p (org-capture-get :target-entry-p)) (target-entry-p (org-capture-get :target-entry-p))
level beg end file) level beg end file)
;; Get the full template
(cond
((and (listp txt) (eq (car txt) 'file))
(if (file-exists-p
(setq file (expand-file-name (nth 1 txt) org-directory)))
(setq txt (org-file-contents file))
(setq txt (format "Template file %s not found" (nth 1 txt)))))
((and (listp txt) (eq (car txt) 'function))
(if (fboundp (nth 1 txt))
(setq txt (funcall (nth 1 txt)))
(setq txt (format "Template function %s not found" (nth 1 txt)))))
((not txt) (setq txt ""))
(t (setq txt "Invalid capture template")))
(cond (cond
((org-capture-get :exact-position) ((org-capture-get :exact-position)
(goto-char (org-capture-get :exact-position))) (goto-char (org-capture-get :exact-position)))