mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

org.el (org-insert-heading): Convert the current line into a headline 

* org.el (org-insert-heading-respect-content): Fix docstring.
(org-insert-heading): When in a non-empty non-headline line,
convert the current line into a headline.

Thanks to Bernt Hansen for reporting this issue.
This commit is contained in:
Bastien Guerry 2013-04-11 00:35:31 +02:00
parent 9ac7fabb46
commit 3449c6d001
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/org.el
View File

@ -1340,9 +1340,8 @@ default the value to be used for all contexts not explicitly
(defcustom org-insert-heading-respect-content nil (defcustom org-insert-heading-respect-content nil
"Non-nil means insert new headings after the current subtree. "Non-nil means insert new headings after the current subtree.
When nil, the new heading is created directly after the current line. When nil, the new heading is created directly after the current line.
The commands \\[org-insert-heading-respect-content] and The commands \\[org-insert-heading-respect-content] and \\[org-insert-todo-heading-respect-content] turn
\\[org-insert-todo-heading-respect-content] turn this variable on this variable on for the duration of the command."
for the duration of the command."
:group 'org-structure :group 'org-structure
:type 'boolean) :type 'boolean)
@ -7536,6 +7535,8 @@ This is important for non-interactive uses of the command."
(or (not (null arg)) org-insert-heading-respect-content)) (or (not (null arg)) org-insert-heading-respect-content))
(level nil) (level nil)
(on-heading (org-at-heading-p)) (on-heading (org-at-heading-p))
(on-empty-line
(save-excursion (beginning-of-line 1) (looking-at "^\\s-*$")))
(head (save-excursion (head (save-excursion
(condition-case nil (condition-case nil
(progn (progn
@ -7588,6 +7589,8 @@ This is important for non-interactive uses of the command."
tags pos) tags pos)
(cond (cond
;; Insert a new line, possibly at end of parent subtree ;; Insert a new line, possibly at end of parent subtree
((and (not arg) (not on-heading) (not on-empty-line))
(beginning-of-line 1))
(org-insert-heading-respect-content (org-insert-heading-respect-content
(if (not eops) (if (not eops)
(progn (progn
@ -7637,7 +7640,9 @@ This is important for non-interactive uses of the command."
(org-set-tags nil 'align)))) (org-set-tags nil 'align))))
(t (t
(or split (end-of-line 1)) (or split (end-of-line 1))
(newline (if blank 2 1)))))) (newline (cond ((and blank (not on-empty-line)) 2)
(blank 1)
(on-empty-line 0) (t 1)))))))
(insert head) (just-one-space) (insert head) (just-one-space)
(setq pos (point)) (setq pos (point))
(end-of-line 1) (end-of-line 1)