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-24 01:25:38 +01:00
parent f0b35a6379 40cb44e795
commit f01ce85026
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-src.el
View File

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

4
lisp/org.el
View File

@ -4090,7 +4090,7 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
(beginning-of-line 1) (beginning-of-line 1)
(when (and (looking-at org-table-line-regexp) (when (and (looking-at org-table-line-regexp)
;; Exclude tables in src/example/verbatim/clocktable blocks ;; Exclude tables in src/example/verbatim/clocktable blocks
(not (org-in-block-p '("src" "example")))) (not (org-in-block-p '("src" "example" "verbatim" "clocktable"))))
(save-excursion (funcall function)) (save-excursion (funcall function))
(or (looking-at org-table-line-regexp) (or (looking-at org-table-line-regexp)
(forward-char 1))) (forward-char 1)))
@ -19375,7 +19375,7 @@ Otherwise, return a user error."
(beginning-of-line 1) (beginning-of-line 1)
(let ((case-fold-search )) (looking-at "[ \t]*#\\+tblfm:")))) (let ((case-fold-search )) (looking-at "[ \t]*#\\+tblfm:"))))
(call-interactively 'org-table-edit-formulas)) (call-interactively 'org-table-edit-formulas))
((or (org-in-block-p '("src" "example")) ((or (org-in-block-p '("src" "example" "latex" "html"))
(org-at-table.el-p)) (org-at-table.el-p))
(org-edit-src-code)) (org-edit-src-code))
((org-in-fixed-width-region-p) (org-edit-fixed-width-region)) ((org-in-fixed-width-region-p) (org-edit-fixed-width-region))