Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-26 22:23:23 +02:00
commit 2e13d33baa
1 changed files with 9 additions and 5 deletions

View File

@ -16217,11 +16217,15 @@ COLUMN formats in the current buffer."
(forward-line) (forward-line)
(when (org-looking-at-p org-planning-line-re) (forward-line)) (when (org-looking-at-p org-planning-line-re) (forward-line))
(unless (org-looking-at-p org-property-drawer-re) (unless (org-looking-at-p org-property-drawer-re)
(let ((inhibit-read-only t)) ;; Make sure we start editing a line from current entry, not from
(unless (bolp) (insert "\n")) ;; next one. It prevents extending text properties or overlays
(let ((begin (point))) ;; belonging to the latter.
(insert ":PROPERTIES:\n:END:\n") (when (bolp) (backward-char))
(org-indent-region begin (point))))))) (let ((begin (1+ (point)))
(inhibit-read-only t))
(insert "\n:PROPERTIES:\n:END:")
(when (eobp) (insert "\n"))
(org-indent-region begin (point))))))
(defun org-insert-drawer (&optional arg drawer) (defun org-insert-drawer (&optional arg drawer)
"Insert a drawer at point. "Insert a drawer at point.