|
@@ -411,7 +411,7 @@ group 4: description tag")
|
|
|
(ind-ref (if (or (looking-at "^[ \t]*$")
|
|
|
(and inlinetask-re (looking-at inlinetask-re)))
|
|
|
10000
|
|
|
- (current-indentation))))
|
|
|
+ (org-current-text-indentation))))
|
|
|
(cond
|
|
|
((eq (nth 2 context) 'invalid) nil)
|
|
|
((looking-at item-re) (point))
|
|
@@ -433,7 +433,7 @@ group 4: description tag")
|
|
|
;; Look for an item, less indented that reference line.
|
|
|
(catch 'exit
|
|
|
(while t
|
|
|
- (let ((ind (current-indentation)))
|
|
|
+ (let ((ind (org-current-text-indentation)))
|
|
|
(cond
|
|
|
;; This is exactly what we want.
|
|
|
((and (looking-at item-re) (< ind ind-ref))
|
|
@@ -603,7 +603,7 @@ Assume point is at an item."
|
|
|
(item-re (org-item-re))
|
|
|
(inlinetask-re (and (featurep 'org-inlinetask)
|
|
|
(org-inlinetask-outline-regexp)))
|
|
|
- (beg-cell (cons (point) (current-indentation)))
|
|
|
+ (beg-cell (cons (point) (org-current-text-indentation)))
|
|
|
itm-lst itm-lst-2 end-lst end-lst-2 struct
|
|
|
(assoc-at-point
|
|
|
;; Return association at point.
|
|
@@ -629,7 +629,7 @@ Assume point is at an item."
|
|
|
(save-excursion
|
|
|
(catch 'exit
|
|
|
(while t
|
|
|
- (let ((ind (current-indentation)))
|
|
|
+ (let ((ind (org-current-text-indentation)))
|
|
|
(cond
|
|
|
((<= (point) lim-up)
|
|
|
;; At upward limit: if we ended at an item, store it,
|
|
@@ -689,7 +689,7 @@ Assume point is at an item."
|
|
|
;; position of items in END-LST-2.
|
|
|
(catch 'exit
|
|
|
(while t
|
|
|
- (let ((ind (current-indentation)))
|
|
|
+ (let ((ind (org-current-text-indentation)))
|
|
|
(cond
|
|
|
((>= (point) lim-down)
|
|
|
;; At downward limit: this is de facto the end of the
|
|
@@ -1840,7 +1840,7 @@ Initial position of cursor is restored after the changes."
|
|
|
(org-inlinetask-goto-beginning))
|
|
|
;; Shift only non-empty lines.
|
|
|
((looking-at-p "^[ \t]*\\S-")
|
|
|
- (indent-line-to (+ (current-indentation) delta))))
|
|
|
+ (indent-line-to (+ (org-current-text-indentation) delta))))
|
|
|
(forward-line -1))))
|
|
|
(modify-item
|
|
|
;; Replace ITEM first line elements with new elements from
|
|
@@ -1848,7 +1848,7 @@ Initial position of cursor is restored after the changes."
|
|
|
(lambda (item)
|
|
|
(goto-char item)
|
|
|
(let* ((new-ind (org-list-get-ind item struct))
|
|
|
- (old-ind (current-indentation))
|
|
|
+ (old-ind (org-current-text-indentation))
|
|
|
(new-bul (org-list-bullet-string
|
|
|
(org-list-get-bullet item struct)))
|
|
|
(old-bul (org-list-get-bullet item old-struct))
|
|
@@ -1938,7 +1938,7 @@ Initial position of cursor is restored after the changes."
|
|
|
;; Ignore empty lines. Also ignore blocks and
|
|
|
;; drawers contents.
|
|
|
(unless (looking-at-p "[ \t]*$")
|
|
|
- (setq min-ind (min (current-indentation) min-ind))
|
|
|
+ (setq min-ind (min (org-current-text-indentation) min-ind))
|
|
|
(cond
|
|
|
((and (looking-at "#\\+BEGIN\\(:\\|_\\S-+\\)")
|
|
|
(re-search-forward
|
|
@@ -3031,7 +3031,7 @@ With a prefix argument ARG, change the region in a single item."
|
|
|
(save-excursion
|
|
|
(catch 'exit
|
|
|
(while (< (point) end)
|
|
|
- (let ((i (current-indentation)))
|
|
|
+ (let ((i (org-current-text-indentation)))
|
|
|
(cond
|
|
|
;; Skip blank lines and inline tasks.
|
|
|
((looking-at "^[ \t]*$"))
|
|
@@ -3047,7 +3047,7 @@ With a prefix argument ARG, change the region in a single item."
|
|
|
(while (< (point) end)
|
|
|
(unless (or (looking-at "^[ \t]*$")
|
|
|
(looking-at org-outline-regexp-bol))
|
|
|
- (indent-line-to (+ (current-indentation) delta)))
|
|
|
+ (indent-line-to (+ (org-current-text-indentation) delta)))
|
|
|
(forward-line))))))
|
|
|
(skip-blanks
|
|
|
(lambda (pos)
|
|
@@ -3139,7 +3139,7 @@ With a prefix argument ARG, change the region in a single item."
|
|
|
;; set them as item's body.
|
|
|
(arg (let* ((bul (org-list-bullet-string "-"))
|
|
|
(bul-len (length bul))
|
|
|
- (ref-ind (current-indentation)))
|
|
|
+ (ref-ind (org-current-text-indentation)))
|
|
|
(skip-chars-forward " \t")
|
|
|
(insert bul)
|
|
|
(forward-line)
|