diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-04-01 11:49:25 +0200 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-04-01 11:49:25 +0200 |
| commit | 153ae947f845f6d4f31d3d239a1449899c3384f0 (patch) | |
| tree | b7ef6c7f4b94f4a4ee19eecd079c36aff84bddc5 /lisp/org/org-capture.el | |
| parent | 42ee526b1adbe2ba7766203980a9d7089aae1a68 (diff) | |
| download | emacs-153ae947f845f6d4f31d3d239a1449899c3384f0.tar.gz | |
Update to Org version 7.8.07 (commit da0e6f in Org's repo)
Diffstat (limited to 'lisp/org/org-capture.el')
| -rw-r--r-- | lisp/org/org-capture.el | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index 31694d47bc0..01ec85d6d7c 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -911,30 +911,30 @@ it. When it is a variable, retrieve the value. Return whatever we get." (target-entry-p (org-capture-get :target-entry-p)) (ind 0) beg end) - (cond - ((org-capture-get :exact-position) - (goto-char (org-capture-get :exact-position))) - ((not target-entry-p) - ;; Insert as top-level entry, either at beginning or at end of file - (setq beg (point-min) end (point-max))) - (t - (setq beg (1+ (point-at-eol)) - end (save-excursion (outline-next-heading) (point))))) - (if (org-capture-get :prepend) - (progn - (goto-char beg) - (if (org-list-search-forward (org-item-beginning-re) end t) - (progn - (goto-char (match-beginning 0)) - (setq ind (org-get-indentation))) - (goto-char end) - (setq ind 0))) - (goto-char end) - (if (org-list-search-backward (org-item-beginning-re) beg t) + (if (org-capture-get :exact-position) + (goto-char (org-capture-get :exact-position)) + (cond + ((not target-entry-p) + ;; Insert as top-level entry, either at beginning or at end of file + (setq beg (point-min) end (point-max))) + (t + (setq beg (1+ (point-at-eol)) + end (save-excursion (outline-next-heading) (point))))) + (if (org-capture-get :prepend) (progn - (setq ind (org-get-indentation)) - (org-end-of-item)) - (setq ind 0))) + (goto-char beg) + (if (org-list-search-forward (org-item-beginning-re) end t) + (progn + (goto-char (match-beginning 0)) + (setq ind (org-get-indentation))) + (goto-char end) + (setq ind 0))) + (goto-char end) + (if (org-list-search-backward (org-item-beginning-re) beg t) + (progn + (setq ind (org-get-indentation)) + (org-end-of-item)) + (setq ind 0)))) ;; Remove common indentation (setq txt (org-remove-indentation txt)) ;; Make sure this is indeed an item |