diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
| commit | bdebdb64b35d6a0a28e04335f4e8e46949206ad3 (patch) | |
| tree | ea3e0d00bd8da93ae89e86744a80f4e162c5361c /lisp/org/org-capture.el | |
| parent | ccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff) | |
| download | emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz | |
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'lisp/org/org-capture.el')
| -rw-r--r-- | lisp/org/org-capture.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index 9d20814a2ca..1dfffc6fe1d 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -434,9 +434,10 @@ Turning on this mode runs the normal hook `org-capture-mode-hook'." ;;; The main commands -;;;###autoload (defvar org-capture-initial nil) (defvar org-capture-entry nil) + +;;;###autoload (defun org-capture-string (string &optional keys) (interactive "sInitial text: \n") (let ((org-capture-initial string) @@ -1249,7 +1250,8 @@ Of course, if exact position has been required, just put it there." (save-restriction (widen) (goto-char pos) - (bookmark-set "org-capture-last-stored") + (with-demoted-errors + (bookmark-set "org-capture-last-stored")) (move-marker org-capture-last-stored-marker (point))))))) (defun org-capture-narrow (beg end) @@ -1280,7 +1282,7 @@ Point will remain at the first line after the inserted text." (goto-char pos))) (defvar org-clock-marker) ; Defined in org.el -;;;###autoload + (defun org-capture-insert-template-here () (let* ((template (org-capture-get :template)) (type (org-capture-get :type)) |