mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-20 19:24:20 +00:00
Code

org-capture: Fix :jump-+to-captured when `org-capture-bookmark' is nil

Browse Source 
* lisp/org-capture.el (org-capture-bookmark-last-stored-position):
  Rename to ...
(org-capture-store-last-position): ... this.  Also store last position
unconditionally.
* lisp/org-capture.el (org-capture-finalize): Apply renaming.
This commit is contained in:
Nicolas Goaziou 2017-01-11 09:52:57 +01:00
parent 6a49de8862
commit 71890398cd
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/org-capture.el
View File

@ -749,8 +749,7 @@ captured item after finalizing."
;; Store this place as the last one where we stored something
;; Do the marking in the base buffer, so that it makes sense after
;; the indirect buffer has been killed.
(when org-capture-bookmark
(org-capture-bookmark-last-stored-position))
(org-capture-store-last-position)
;; Run the hook
(run-hooks 'org-capture-before-finalize-hook))
@ -1305,8 +1304,8 @@ Of course, if exact position has been required, just put it there."
(org-table-current-dline))))
(t (error "This should not happen"))))
(defun org-capture-bookmark-last-stored-position ()
"Bookmark the last-captured position."
(defun org-capture-store-last-position ()
"Store the last-captured position."
(let* ((where (org-capture-get :position-for-last-stored 'local))
(pos (cond
((markerp where)
@ -1319,14 +1318,11 @@ Of course, if exact position has been required, just put it there."
(point-at-bol))
(point))))))
(with-current-buffer (buffer-base-buffer (current-buffer))
(org-with-wide-buffer
(goto-char pos)
(let ((bookmark-name (plist-get org-bookmark-names-plist
:last-capture)))
(when bookmark-name
(with-demoted-errors
(bookmark-set bookmark-name))))
(move-marker org-capture-last-stored-marker (point))))))
(org-with-point-at pos
(when org-capture-bookmark
(let ((bookmark (plist-get org-bookmark-names-plist :last-capture)))
(when bookmark (with-demoted-errors (bookmark-set bookmark)))))
(move-marker org-capture-last-stored-marker (point))))))
(defun org-capture-narrow (beg end)
"Narrow, unless configuration says not to narrow."