diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2013-09-13 21:09:49 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2013-09-13 21:09:49 +0200 |
commit | e7649baa3a780bfc03199a26ed1c31342ae7ebcb (patch) | |
tree | d4ce247f7ff3bb68097bf724b2c9e91798b5a6ad | |
parent | 5aed072d3b2b95f350c0588cf6f211236c4c14e0 (diff) | |
parent | de72cd384d9cdbb7a67bf7a20ca4683d8a96d531 (diff) | |
download | org-mode-e7649baa3a780bfc03199a26ed1c31342ae7ebcb.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index ecc2612..c16b8b0 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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. |