0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-20 15:48:31 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-20 01:20:21 +01:00
commit 15426c6fd0
2 changed files with 5 additions and 4 deletions

View file

@ -39,6 +39,7 @@
(declare-function org-do-remove-indentation "org" (&optional n))
(declare-function org-at-table.el-p "org" ())
(declare-function org-in-src-block-p "org" (&optional inside))
(declare-function org-get-indentation "org" (&optional line))
(declare-function org-switch-to-buffer-other-window "org" (&rest args))
(declare-function org-pop-to-buffer-same-window

View file

@ -19301,6 +19301,10 @@ See the individual commands for more information."
(org-table-paste-rectangle)
(org-paste-subtree arg)))
(defsubst org-in-fixed-width-region-p ()
"Is point in a fixed-width region?"
(eq 'fixed-width (org-element-type (org-element-at-point))))
(defun org-edit-special (&optional arg)
"Call a special editor for the stuff at point.
When at a table, call the formula editor with `org-table-edit-formulas'.
@ -20608,10 +20612,6 @@ when point is at #+BEGIN_SRC or #+END_SRC."
(move-beginning-of-line 1)
(looking-at ".*#\\+\\(BEGIN\\|END\\)_SRC")))))))
(defsubst org-in-fixed-width-region-p ()
"Is point in a fixed-width region?"
(eq 'fixed-width (org-element-type (org-element-at-point))))
(defun org-context ()
"Return a list of contexts of the current cursor position.
If several contexts apply, all are returned.