diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-12-23 17:54:47 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-12-23 17:54:47 +0100 |
| commit | 88555aab22f079042121e402c84e5ed166252452 (patch) | |
| tree | 29e2edf1698994c0c9dd7e022bec78a5d7f5ae16 | |
| parent | ae7516b0e1a98b2c3a2d2d88b38e91e8e01926e1 (diff) | |
| parent | 98a5f3df328d883c43081d565d91edf3f29648da (diff) | |
| download | org-mode-88555aab22f079042121e402c84e5ed166252452.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-src.el | 4 | ||||
| -rw-r--r-- | lisp/org.el | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el index 0ac2f02..e55675a 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -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))) diff --git a/lisp/org.el b/lisp/org.el index 66449e9..2f14936 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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)) |