diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-11-26 19:51:51 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-11-26 19:51:51 +0100 |
commit | 32a7305ddaca97334b380829f063ad95b0f59d3b (patch) | |
tree | e08196217d81db6c957962a4e9d147c64b8f0c9e | |
parent | d228909d15b08878a967b3505171b218cfbd15f2 (diff) | |
download | org-mode-32a7305ddaca97334b380829f063ad95b0f59d3b.tar.gz |
Fix <RET> on table.el tables
* lisp/org.el (org-return): Prevent wrong type error when on
a table.el table.
-rw-r--r-- | lisp/org.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index b78243c..ed766f9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20442,7 +20442,8 @@ object (e.g., within a comment). In these case, you need to use (cond ;; In a table, call `org-table-next-row'. However, before first ;; column or after last one, split the table. - ((or (and (eq (org-element-type context) 'table) + ((or (and (eq 'table (org-element-type context)) + (not (eq 'table.el (org-element-property :type context))) (>= (point) (org-element-property :contents-begin context)) (< (point) (org-element-property :contents-end context))) (org-element-lineage context '(table-row table-cell) t)) @@ -20468,9 +20469,8 @@ object (e.g., within a comment). In these case, you need to use (call-interactively #'org-open-at-point)) ;; Insert newline in heading, but preserve tags. ((and (not (bolp)) - (save-excursion (beginning-of-line) - (let ((case-fold-search nil)) - (looking-at org-complex-heading-regexp)))) + (let ((case-fold-search nil)) + (org-match-line org-complex-heading-regexp))) ;; 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. |