Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-08-13 10:11:59 +02:00
commit d2871b007b

View file

@ -7568,7 +7568,7 @@ the inserted text when done."
(if force-level
(delete-region (point-at-bol) (point)))
;; Paste
(beginning-of-line (if (org-at-heading-p) 2 1))
(beginning-of-line (if (bolp) 2 1))
(unless for-yank (org-back-over-empty-lines))
(setq beg (point))
(and (fboundp 'org-id-paste-tracker) (org-id-paste-tracker txt))