summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-02-19 14:37:41 (GMT)
committer Nicolas Goaziou <mail@nicolasgoaziou.fr>2017-02-19 14:37:41 (GMT)
commitd1577d1e1bc78c5b0d6c9911fd7a8c89526d0d16 (patch)
treeb596ee7477fe7bc075bf9d7fb4e33e94f4f43e85
parentb5d8be4a5fa99567624c46aa1f4873a1d424bbcd (diff)
parent7d7c38c6b1255a3a1ddd03f32849232bf86200e3 (diff)
downloadorg-mode-master.zip
org-mode-master.tar.gz
Merge branch 'maint'HEADmaster
-rw-r--r--lisp/org-capture.el34
-rw-r--r--testing/lisp/test-org-capture.el36
2 files changed, 49 insertions, 21 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 1a1a500..976d1d9 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -821,20 +821,28 @@ Refiling is done from the base buffer, because the indirect buffer is then
already gone. Any prefix argument will be passed to the refile command."
(interactive)
(unless (eq (org-capture-get :type 'local) 'entry)
- (error
- "Refiling from a capture buffer makes only sense for `entry'-type templates"))
- (let ((pos (point))
- (base (buffer-base-buffer (current-buffer)))
- (org-capture-is-refiling t)
- (kill-buffer (org-capture-get :kill-buffer 'local)))
+ (user-error "Refiling from a capture buffer makes only sense \
+for `entry'-type templates"))
+ (let* ((base (or (buffer-base-buffer) (current-buffer)))
+ (pos (make-marker))
+ (org-capture-is-refiling t)
+ (kill-buffer (org-capture-get :kill-buffer 'local)))
+ ;; Since `org-capture-finalize' may alter buffer contents (e.g.,
+ ;; empty lines) around entry, use a marker to refer to the
+ ;; headline to be refiled. Place the marker in the base buffer,
+ ;; as the current indirect one is going to be killed.
+ (set-marker pos (save-excursion (org-back-to-heading t)) base)
(org-capture-put :kill-buffer nil)
- (org-capture-finalize)
- (save-window-excursion
- (with-current-buffer (or base (current-buffer))
- (org-with-wide-buffer
- (goto-char pos)
- (call-interactively 'org-refile))))
- (when kill-buffer (kill-buffer base))))
+ (unwind-protect
+ (progn
+ (org-capture-finalize)
+ (save-window-excursion
+ (with-current-buffer base
+ (org-with-wide-buffer
+ (goto-char pos)
+ (call-interactively 'org-refile))))
+ (when kill-buffer (kill-buffer base)))
+ (set-marker pos nil))))
(defun org-capture-kill ()
"Abort the current capture process."
diff --git a/testing/lisp/test-org-capture.el b/testing/lisp/test-org-capture.el
index 6b86410..3f477b2 100644
--- a/testing/lisp/test-org-capture.el
+++ b/testing/lisp/test-org-capture.el
@@ -87,14 +87,34 @@
;; %(sexp) placeholder with an input containing the traps %, " and )
;; all at once which is complicated to parse.
(should
- (equal
- "5 % Less (See Item \"3)\" Somewhere)\n"
- (let ((org-store-link-plist nil))
- (org-capture-fill-template
- "%(capitalize \"%i\")"
- "5 % less (see item \"3)\" somewhere)")))))
-
-
+ (equal "5 % Less (See Item \"3)\" Somewhere)\n"
+ (let ((org-store-link-plist nil))
+ (org-capture-fill-template
+ "%(capitalize \"%i\")"
+ "5 % less (see item \"3)\" somewhere)")))))
+
+(ert-deftest test-org-capture/refile ()
+ "Test `org-capture-refile' specifications."
+ ;; When refiling, make sure the headline being refiled is the one
+ ;; being captured. In particular, empty lines after the entry may
+ ;; be removed, and we don't want to shift onto the next heading.
+ (should
+ (string-prefix-p
+ "** H1"
+ (org-test-with-temp-text-in-file "* A\n* B\n"
+ (let* ((file (buffer-file-name))
+ (org-capture-templates
+ `(("t" "Todo" entry (file+headline ,file "A") "** H1 %?"))))
+ (org-capture nil "t")
+ (insert "\n")
+ (cl-letf (((symbol-function 'org-refile)
+ (lambda ()
+ (interactive)
+ (throw :return
+ (buffer-substring-no-properties
+ (line-beginning-position)
+ (line-end-position))))))
+ (catch :return (org-capture-refile))))))))
(provide 'test-org-capture)