summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-08 22:44:54 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-08 22:44:54 (GMT)
commite53f22c615d217c73ccc9dc23bd39516d49482f5 (patch)
treeda96acb7721bd42b196b1ffd51f6e07532678908
parent8c5a46c35d431197dc879fc473b97721bb2d9aa5 (diff)
downloadorg-mode-e53f22c615d217c73ccc9dc23bd39516d49482f5.zip
org-mode-e53f22c615d217c73ccc9dc23bd39516d49482f5.tar.gz
org.el (org-edit-special): Check for table.el before checking for Org tables
* org.el (org-edit-special): Check for table.el before checking for Org tables. Thanks to Jacobo de Vera for reporting this.
-rw-r--r--lisp/org.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 32ed13f..782e2a6 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19026,14 +19026,13 @@ Otherwise, return a user error."
(beginning-of-line 1)
(looking-at "\\(?:#\\+\\(?:setupfile\\|include\\):?[ \t]+\"?\\|[ \t]*<include\\>.*?file=\"\\)\\([^\"\n>]+\\)"))
(find-file (org-trim (match-string 1))))
+ ((org-at-table.el-p) (org-edit-src-code))
((or (org-at-table-p)
(save-excursion
(beginning-of-line 1)
(let ((case-fold-search )) (looking-at "[ \t]*#\\+tblfm:"))))
(call-interactively 'org-table-edit-formulas))
- ((or (org-in-block-p '("src" "example" "latex" "html"))
- (org-at-table.el-p))
- (org-edit-src-code))
+ ((org-in-block-p '("src" "example" "latex" "html")) (org-edit-src-code))
((org-in-fixed-width-region-p) (org-edit-fixed-width-region))
((org-at-regexp-p org-any-link-re) (call-interactively 'ffap))
(t (user-error "No special environment to edit here"))))