Merge branch 'maint'

lisp/org-src.el

@@ -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

lisp/org.el

@@ -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.