diff options
| author | Bastien Guerry | 2013-01-08 16:31:30 +0100 |
|---|---|---|
| committer | Bastien Guerry | 2013-01-08 16:31:30 +0100 |
| commit | 6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb (patch) | |
| tree | f9115fbdc6e42a73b57e20a27334057b80275814 /lisp/org/org-src.el | |
| parent | c7cf0ebc24d66371c8d48ad72f65e72a2a027f06 (diff) | |
| download | emacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.tar.gz emacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.zip | |
Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.
Diffstat (limited to 'lisp/org/org-src.el')
| -rw-r--r-- | lisp/org/org-src.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index 221ae367c87..277196bb768 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el | |||
| @@ -211,7 +211,8 @@ edited version. An optional argument CONTEXT is used by \\[org-edit-src-save] | |||
| 211 | when calling this function. See `org-src-window-setup' to configure | 211 | when calling this function. See `org-src-window-setup' to configure |
| 212 | the display of windows containing the Org buffer and the code buffer." | 212 | the display of windows containing the Org buffer and the code buffer." |
| 213 | (interactive) | 213 | (interactive) |
| 214 | (if (not (org-in-block-p '("src" "example" "latex" "html"))) | 214 | (if (not (or (org-in-block-p '("src" "example" "latex" "html")) |
| 215 | (org-at-table.el-p))) | ||
| 215 | (user-error "Not in a source code or example block") | 216 | (user-error "Not in a source code or example block") |
| 216 | (unless (eq context 'save) | 217 | (unless (eq context 'save) |
| 217 | (setq org-edit-src-saved-temp-window-config (current-window-configuration))) | 218 | (setq org-edit-src-saved-temp-window-config (current-window-configuration))) |