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

Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint

This commit is contained in:
Bastien 2018-02-27 08:36:59 +01:00
parent ca4ddc331c e810e6e5f9
commit f400694165
2 changed files with 519 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1031
doc/org.texi
View File

File diff suppressed because it is too large Load Diff

5
lisp/org.el
View File

@ -8536,7 +8536,6 @@ When REMOVE is non-nil, remove the subtree from the clipboard."
(org-with-limited-levels
(let* ((visp (not (org-invisible-p)))
(txt tree)
(^re_ "\\(\\*+\\)[ \t]*")
(old-level (if (string-match org-outline-regexp-bol txt)
(- (match-end 0) (match-beginning 0) 1)
-1))
@ -8553,7 +8552,7 @@ When REMOVE is non-nil, remove the subtree from the clipboard."
(condition-case nil
(progn
(outline-previous-visible-heading 1)
(if (looking-at ^re_)
(if (looking-at org-outline-regexp-bol)
(- (match-end 0) (match-beginning 0) 1)
1))
(error 1))))
@ -8562,7 +8561,7 @@ When REMOVE is non-nil, remove the subtree from the clipboard."
(progn
(or (looking-at org-outline-regexp)
(outline-next-visible-heading 1))
(if (looking-at ^re_)
(if (looking-at org-outline-regexp-bol)
(- (match-end 0) (match-beginning 0) 1)
1))
(error 1))))