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 2012-12-23 17:54:47 +01:00
parent ae7516b0e1 98a5f3df32
commit 88555aab22
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-src.el
View File

@ -210,8 +210,8 @@ edited version. An optional argument CONTEXT is used by \\[org-edit-src-save]
when calling this function. See `org-src-window-setup' to configure
the display of windows containing the Org buffer and the code buffer."
(interactive)
(if (not (org-in-block-p '("src" "example" "verbatim")))
(user-error "Not in a source code block")
(if (not (org-in-block-p '("src" "example")))
(user-error "Not in a source code or example block")
(unless (eq context 'save)
(setq org-edit-src-saved-temp-window-config (current-window-configuration)))
(let* ((mark (and (org-region-active-p) (mark)))

2
lisp/org.el
View File

@ -19361,7 +19361,7 @@ Otherwise, return a user error."
(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" "verbatim"))
((or (org-in-block-p '("src" "example"))
(org-at-table.el-p))
(org-edit-src-code))
((org-in-fixed-width-region-p) (org-edit-fixed-width-region))