summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-07-13 14:12:45 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-07-13 14:12:45 +0200
commitcb1ab577a2a1b21fb1acf2a726f5fe3e5d59cb13 (patch)
treec095de5c96323b6c23507daf2dce2052eebbb1bf
parentd5229333cde4e5c3bfb69a1e8e0f5a52f7eaa9b8 (diff)
downloadorg-mode-cb1ab577a2a1b21fb1acf2a726f5fe3e5d59cb13.tar.gz
Fix bookmarking the capture position
* lisp/org-capture.el (org-capture-refile): Do not try to manipulate bookmark list. * lisp/org.el (org-refile): Use the correct bookmark here.
-rw-r--r--lisp/org-capture.el11
-rw-r--r--lisp/org.el2
2 files changed, 2 insertions, 11 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 7648167..2cb6876 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -547,16 +547,7 @@ already gone."
(save-restriction
(widen)
(goto-char pos)
- (call-interactively 'org-refile)
- (when (and (boundp 'bookmark-alist)
- (assoc "org-capture-last-stored" bookmark-alist))
- (if (assoc "org-refile-last-stored" bookmark-alist)
- (setcdr (assoc "org-refile-last-stored" bookmark-alist)
- (cdr (assoc "org-refile-last-stored" bookmark-alist)))
- (push (cons "org-capture-last-stored"
- (cdr (assoc "org-refile-last-stored"
- bookmark-alist)))
- bookmark-alist)))))))))
+ (call-interactively 'org-refile)))))))
(defun org-capture-kill ()
"Abort the current capture process."
diff --git a/lisp/org.el b/lisp/org.el
index b821901..6118e13 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10143,7 +10143,7 @@ This can be done with a 0 prefix: `C-0 C-c C-w'"
;; If we are refiling for capture, make sure that the
;; last-capture pointers point here
(when (org-bound-and-true-p org-refile-for-capture)
- (bookmark-set "org-refile-last-stored")
+ (bookmark-set "org-capture-last-stored-marker")
(move-marker org-capture-last-stored-marker (point)))
(if (fboundp 'deactivate-mark) (deactivate-mark))
(run-hooks 'org-after-refile-insert-hook))))