tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source 
Conflicts:
	lisp/ob.el
This commit is contained in:
Bastien Guerry 2012-12-21 09:33:19 +01:00
parent 72c2dc07a8 30922bd7e9
commit fa17bf12d5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/org.el
View file

@ -19311,6 +19311,7 @@ See the individual commands for more information."
"Call a special editor for the stuff at point.
When at a table, call the formula editor with `org-table-edit-formulas'.
When in a source code block, call `org-edit-src-code'.
When in a fixed-width region, call `org-edit-fixed-width-region'.
When in an #+include line, visit the included file.
On a link, call `ffap' to visit the link at point.
Otherwise, return a user error."
@ -20604,14 +20605,13 @@ and end of string."
When INSIDE is non-nil, don't consider we are within a src block
when point is at #+BEGIN_SRC or #+END_SRC."
(let ((case-fold-search t) ov)
(or (when (setq ov (overlays-at (point)))
(memq 'org-block-background
(overlay-properties
(car ov))))
(or (and (setq ov (overlays-at (point)))
(memq 'org-block-background
(overlay-properties (car ov))))
(and (not inside)
(save-match-data
(save-excursion
(move-beginning-of-line 1)
(beginning-of-line)
(looking-at ".*#\\+\\(begin\\|end\\)_src")))))))
(defun org-context ()