org.el (org-edit-special): Check for table.el before checking for Org tables
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 22:44:54 +0000 (8 23:44 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 22:44:54 +0000 (8 23:44 +0100)
* org.el (org-edit-special): Check for table.el before
checking for Org tables.

Thanks to Jacobo de Vera for reporting this.

lisp/org.el

index 32ed13f..782e2a6 100644 (file)
@@ -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"))))