Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2017-05-26 00:21:14 -04:00
commit b92eb81731
1 changed files with 1 additions and 1 deletions

View File

@ -22518,6 +22518,7 @@ it for output."
;;; Indentation ;;; Indentation
(defvar org-element-greater-elements)
(defun org--get-expected-indentation (element contentsp) (defun org--get-expected-indentation (element contentsp)
"Expected indentation column for current line, according to ELEMENT. "Expected indentation column for current line, according to ELEMENT.
ELEMENT is an element containing point. CONTENTSP is non-nil ELEMENT is an element containing point. CONTENTSP is non-nil
@ -24446,7 +24447,6 @@ Move to the previous element at the same level, when possible."
(user-error "No surrounding element") (user-error "No surrounding element")
(org-with-limited-levels (org-back-to-heading))))))) (org-with-limited-levels (org-back-to-heading)))))))
(defvar org-element-greater-elements)
(defun org-down-element () (defun org-down-element ()
"Move to inner element." "Move to inner element."
(interactive) (interactive)