tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-13 02:44:02 +02:00
parent 0461101fbb 4dc79cbe9d
commit 4bb5306f2d
2 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
lisp/org.el
View File

@ -21287,66 +21287,58 @@ will not happen if point is in a table or on a \"dead\"
object (e.g., within a comment). In these case, you need to use
`org-open-at-point' directly."
(interactive)
(if (and (not (bolp))
(let* ((context (if org-return-follows-link (org-element-context)
(org-element-at-point)))
(type (org-element-type context)))
(cond
;; In a table, call `org-table-next-row'.
((or (and (eq type 'table)
(>= (point) (org-element-property :contents-begin context))
(< (point) (org-element-property :contents-end context)))
(org-element-lineage context '(table-row table-cell) t))
(org-table-justify-field-maybe)
(call-interactively #'org-table-next-row))
;; On a link or a timestamp but not on white spaces after it,
;; call `org-open-line' if `org-return-follows-link' allows it.
((and org-return-follows-link
(memq type '(link timestamp))
(< (point)
(save-excursion (goto-char (org-element-property :end context))
(skip-chars-backward " \t")
(point))))
(call-interactively #'org-open-at-point))
;; Insert newline in heading, but preserve tags.
((and (not (bolp))
(save-excursion (beginning-of-line)
(looking-at org-complex-heading-regexp)))
;; At headline.
(let ((tags-column (when (match-beginning 5)
(save-excursion (goto-char (match-beginning 5))
(current-column))))
;; Test if before or after headline title.
(string (when (and (match-end 4)
(not (or (< (point)
(or (match-end 3)
(match-end 2)
(save-excursion
(goto-char (match-beginning 4))
(skip-chars-backward " \t")
(point))))
(and (match-beginning 5)
(>= (point) (match-beginning 5))))))
;; Point is on headline keywords, tags or cookies. Do not break
;; them: add a newline after the headline instead.
(org-string-nw-p
(delete-and-extract-region (point) (match-end 4))))))
;; Adjust alignment of tags.
(when (and tags-column string)
(org-align-tags-here (if org-auto-align-tags
org-tags-column
tags-column)))
;; At headline. Split line. However, if point is on keyword,
;; priority cookie or tags, do not break any of them: add
;; a newline after the headline instead.
(let ((tags-column (and (match-beginning 5)
(save-excursion (goto-char (match-beginning 5))
(current-column))))
(string
(when (and (match-end 4)
(>= (point)
(or (match-end 3) (match-end 2) (1+ (match-end 1))))
(<= (point) (match-end 4)))
(delete-and-extract-region (point) (match-end 4)))))
(when (and tags-column string) ; Adjust tag alignment.
(org-align-tags-here
(if org-auto-align-tags org-tags-column tags-column)))
(end-of-line)
(org-show-entry)
(if indent (newline-and-indent) (newline))
(and string (save-excursion (insert (org-trim string)))))
(let* ((context (if org-return-follows-link (org-element-context)
(org-element-at-point)))
(type (org-element-type context)))
(cond
;; In a table, call `org-table-next-row'.
((or (and (eq type 'table)
(>= (point) (org-element-property :contents-begin context))
(< (point) (org-element-property :contents-end context)))
(org-element-lineage context '(table-row table-cell) t))
(org-table-justify-field-maybe)
(call-interactively #'org-table-next-row))
;; On a link or a timestamp but not on white spaces after it,
;; call `org-open-line' if `org-return-follows-link' allows it.
((and org-return-follows-link
(memq type '(link timestamp))
(< (point)
(save-excursion (goto-char (org-element-property :end context))
(skip-chars-backward " \t")
(point))))
(call-interactively #'org-open-at-point))
;; In a list, make sure indenting keeps trailing text within.
((and indent
(not (eolp))
(org-element-lineage context '(item)))
(let ((trailing-data
(delete-and-extract-region (point) (line-end-position))))
(newline-and-indent)
(save-excursion (insert trailing-data))))
(t (if indent (newline-and-indent) (newline)))))))
(when string (save-excursion (insert (org-trim string))))))
;; In a list, make sure indenting keeps trailing text within.
((and indent
(not (eolp))
(org-element-lineage context '(item)))
(let ((trailing-data
(delete-and-extract-region (point) (line-end-position))))
(newline-and-indent)
(save-excursion (insert trailing-data))))
(t (if indent (newline-and-indent) (newline))))))
(defun org-return-indent ()
"Goto next table row or insert a newline and indent.

12
testing/lisp/test-org.el
View File

@ -893,6 +893,12 @@
(org-test-with-temp-text "Link [[target<point>]] <<target>>"
(let ((org-return-follows-link nil)) (org-return))
(org-looking-at-p "<<target>>")))
;; Link in heading should also be opened when
;; `org-return-follows-link` is non-nil.
(should
(org-test-with-temp-text "* [[b][a<point>]]\n* b"
(let ((org-return-follows-link t)) (org-return))
(org-looking-at-p "* b")))
;; However, do not open link when point is in a table.
(should
(org-test-with-temp-text "| [[target<point>]] |\n| between |\n| <<target>> |"
@ -939,6 +945,12 @@
(should
(equal "\n* h"
(org-test-with-temp-text "<point>* h"
(org-return)
(buffer-string))))
;; Refuse to leave invalid headline in buffer.
(should
(equal "* h\n"
(org-test-with-temp-text "*<point> h"
(org-return)
(buffer-string)))))