ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-05-23 18:15:42 +02:00
parent b3497fdeb6 d6f096546e
commit a023b31e48
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/org-capture.el
View File

@ -752,16 +752,6 @@ captured item after finalizing."
(kill-region m1 m2))
(setq abort-note 'dirty)))
;; Make sure that the empty lines after are correct
(when (and (> (point-max) end) ; indeed, the buffer was still narrowed
(member (org-capture-get :type 'local)
'(entry item checkitem plain)))
(save-excursion
(goto-char end)
(or (bolp) (newline))
(org-capture-empty-lines-after
(or (org-capture-get :empty-lines-after 'local)
(org-capture-get :empty-lines 'local) 0))))
;; Postprocessing: Update Statistics cookies, do the sorting
(when (derived-mode-p 'org-mode)
(save-excursion
@ -1131,7 +1121,7 @@ may have been stored before."
(setq beg (point))
(org-capture-verify-tree txt)
(org-paste-subtree level txt 'for-yank)
(org-capture-empty-lines-after 1)
(org-capture-empty-lines-after)
(org-capture-position-for-last-stored beg)
(outline-next-heading)
(setq end (point))
@ -1191,7 +1181,7 @@ may have been stored before."
"\n"))
;; Insert item.
(insert txt)
(org-capture-empty-lines-after 1)
(org-capture-empty-lines-after)
(org-capture-position-for-last-stored beg)
(forward-char 1)
(setq end (point))
@ -1312,7 +1302,7 @@ Of course, if exact position has been required, just put it there."
(org-capture-empty-lines-before)
(setq beg (point))
(insert txt)
(org-capture-empty-lines-after 1)
(org-capture-empty-lines-after)
(org-capture-position-for-last-stored beg)
(setq end (point))
(org-capture-mark-kill-region beg (1- end))
@ -1396,7 +1386,7 @@ Point will remain at the first line after the inserted text."
(let* ((template (org-capture-get :template))
(type (org-capture-get :type))
beg end pp)
(or (bolp) (newline))
(unless (bolp) (insert "\n"))
(setq beg (point))
(cond
((and (eq type 'entry) (derived-mode-p 'org-mode))
@ -1418,12 +1408,15 @@ Point will remain at the first line after the inserted text."
(org-capture-empty-lines-after)
(goto-char beg)
(org-list-repair)
(org-end-of-item)
(setq end (point)))
(t (insert template)))
(org-end-of-item))
(t
(insert template)
(org-capture-empty-lines-after)
(skip-chars-forward " \t\n")
(unless (eobp) (beginning-of-line))))
(setq end (point))
(goto-char beg)
(if (re-search-forward "%\\?" end t)
(when (re-search-forward "%\\?" end t)
(replace-match ""))))
(defun org-capture-set-plist (entry)

2
testing/lisp/test-org-capture.el
View File

@ -1,6 +1,6 @@
;;; test-org-capture.el --- Tests for org-capture.el -*- lexical-binding: t; -*-
;; Copyright (C) 2015 Nicolas Goaziou
;; Copyright (C) 2015, 2017 Nicolas Goaziou
;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>