diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-08 23:44:59 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-08 23:44:59 +0100 |
commit | 94ea6bca087e92feae6d97be6b2c6072c93c0fd8 (patch) | |
tree | 06c1d675677f4bca87d58b8485c9c799df0ecfe5 | |
parent | 832b6e66ea453a01dbb7b2b4f49513e9cb782a0f (diff) | |
parent | e53f22c615d217c73ccc9dc23bd39516d49482f5 (diff) | |
download | org-mode-94ea6bca087e92feae6d97be6b2c6072c93c0fd8.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el index cddae51..a8f07f6 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19463,14 +19463,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")))) |