diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-06-06 12:50:44 +0200 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-06-06 12:51:27 +0200 |
| commit | 28babd4dffde5949b2b668b0c9e2867d2ad55a70 (patch) | |
| tree | 0de6a3859ff2e681b51b537179f84b9394f891ab | |
| parent | 7920c4425c055ff3f9cdea3e3c75e7cb7e282f2e (diff) | |
| download | org-mode-28babd4dffde5949b2b668b0c9e2867d2ad55a70.tar.gz | |
Better recognizing of source code snippets
* lisp/org.el (org-edit-special): Make sure source code editing goes
before table formula editing.
* lisp/org-table.el (org-table-fedit-map): "C-c '" will now also exit
the formula editor.
| -rw-r--r-- | lisp/org-table.el | 3 | ||||
| -rw-r--r-- | lisp/org.el | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index 3c63e70..46efc28 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -2764,6 +2764,7 @@ Parameters get priority." (org-defkey map "\C-x\C-s" 'org-table-fedit-finish) (org-defkey map "\C-c\C-s" 'org-table-fedit-finish) (org-defkey map "\C-c\C-c" 'org-table-fedit-finish) + (org-defkey map "\C-c'" 'org-table-fedit-finish) (org-defkey map "\C-c\C-q" 'org-table-fedit-abort) (org-defkey map "\C-c?" 'org-table-show-reference) (org-defkey map [(meta shift up)] 'org-table-fedit-line-up) @@ -2860,7 +2861,7 @@ Parameters get priority." (if (eq org-table-use-standard-references t) (org-table-fedit-toggle-ref-type)) (org-goto-line startline) - (message "Edit formulas and finish with `C-c C-c'. See menu for more commands."))) + (message "Edit formulas, finish with `C-c C-c' or `C-c ' '. See menu for more commands."))) (defun org-table-fedit-post-command () (when (not (memq this-command '(lisp-complete-symbol))) diff --git a/lisp/org.el b/lisp/org.el index e1f6c4c..c1340ec 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16859,16 +16859,16 @@ When in an #+include line, visit the include file. Otherwise call `ffap' to visit the file at point." (interactive) (cond - ((org-at-table.el-p) - (org-edit-src-code)) - ((org-at-table-p) - (call-interactively 'org-table-edit-formulas)) ((save-excursion (beginning-of-line 1) (looking-at "\\(?:#\\+\\(?:setupfile\\|include\\):?[ \t]+\"?\\|[ \t]*<include\\>.*?file=\"\\)\\([^\"\n>]+\\)")) (find-file (org-trim (match-string 1)))) ((org-edit-src-code)) ((org-edit-fixed-width-region)) + ((org-at-table.el-p) + (org-edit-src-code)) + ((org-at-table-p) + (call-interactively 'org-table-edit-formulas)) (t (call-interactively 'ffap)))) |