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'

This commit is contained in:
Carsten Dominik 2013-09-13 21:09:49 +02:00
parent 5aed072d3b de72cd384d
commit e7649baa3a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org.el
View File

@ -1291,6 +1291,11 @@ OK to kill that hidden subtree. When nil, kill without remorse."
(const :tag "Protect hidden subtrees with a security query" t)
(const :tag "Never kill a hidden subtree with C-k" error)))
(defcustom org-special-ctrl-o t
"Non-nil means, make `C-o' insert a row in tables."
:group 'org-edit-structure
:type 'boolean)
(defcustom org-catch-invisible-edits nil
"Check if in invisible region before inserting or deleting a character.
Valid values are:
@ -20367,11 +20372,16 @@ Also updates the keyword regular expressions."
(funcall org-finish-function))))
(defun org-open-line (n)
"Insert a new row in tables, call `open-line' elsewhere."
"Insert a new row in tables, call `open-line' elsewhere.
If `org-special-ctrl-o' is nil, just call `open-line' everywhere."
(interactive "*p")
(if (org-at-table-p)
(org-table-insert-row)
(open-line n)))
(cond
((not org-special-ctrl-o)
(open-line n))
((org-at-table-p)
(org-table-insert-row))
(t
(open-line n))))
(defun org-return (&optional indent)
"Goto next table row or insert a newline.