ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-08 23:44:59 +01:00
parent 832b6e66ea e53f22c615
commit 94ea6bca08
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -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"))))