forked from mirrors/org-mode
org-list: reorder file, rename functions, improve comments
* lisp/ob.el (org-babel-result-end): apply renaming. * lisp/org-exp.el (org-export-mark-list-properties): apply renaming. * lisp/org-list.el (org-list-prevs-alist): renamed from org-list-struct-prev-alist. (org-list-parents-alist): renamed from org-list-struct-parent-alist. (org-list-write-struct): renamed from org-list-struct-fix-struct. (org-list-parse-list, org-sort-list, org-list-indent-item-generic, org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet, org-list-repair, org-insert-item, org-move-item-up, org-move-item-up, org-move-item-down, org-next-item, org-previous-item, org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list): apply renaming. (org-get-bullet): removed function, as it is not needed anymore.
This commit is contained in:
parent
a02d2ad13e
commit
bd68169b4b
|
@ -77,7 +77,7 @@
|
|||
(declare-function org-list-parse-list "org-list" (&optional delete))
|
||||
(declare-function org-list-to-generic "org-list" (LIST PARAMS))
|
||||
(declare-function org-list-struct "org-list" ())
|
||||
(declare-function org-list-struct-prev-alist "org-list" (struct))
|
||||
(declare-function org-list-prevs-alist "org-list" (struct))
|
||||
(declare-function org-list-get-list-end "org-list" (item struct prevs))
|
||||
|
||||
(defgroup org-babel nil
|
||||
|
@ -1585,7 +1585,7 @@ code ---- the results are extracted in the syntax of the source
|
|||
(cond
|
||||
((org-at-table-p) (progn (goto-char (org-table-end)) (point)))
|
||||
((org-at-item-p) (let* ((struct (org-list-struct))
|
||||
(prevs (org-list-struct-prev-alist struct)))
|
||||
(prevs (org-list-prevs-alist struct)))
|
||||
(org-list-get-list-end (point-at-bol) struct prevs)))
|
||||
(t
|
||||
(let ((case-fold-search t)
|
||||
|
|
|
@ -1718,7 +1718,7 @@ These special properties will later be interpreted by the backend."
|
|||
(let* ((struct (org-list-struct))
|
||||
(top (org-list-get-top-point struct))
|
||||
(bottom (org-list-get-bottom-point struct))
|
||||
(prevs (org-list-struct-prev-alist struct))
|
||||
(prevs (org-list-prevs-alist struct))
|
||||
poi)
|
||||
;; Get every item and ending position, without dups and
|
||||
;; without bottom point of list.
|
||||
|
|
2158
lisp/org-list.el
2158
lisp/org-list.el
File diff suppressed because it is too large
Load Diff
|
@ -209,15 +209,15 @@ it in the buffer."
|
|||
(interactive "P")
|
||||
(let ((itemp (org-in-item-p)))
|
||||
(cond
|
||||
;; In a timer list, insert with `org-list-insert-item-generic',
|
||||
;; In a timer list, insert with `org-list-insert-item',
|
||||
;; then fix the list.
|
||||
((and itemp
|
||||
(save-excursion (goto-char itemp) (org-at-item-timer-p)))
|
||||
(let* ((struct (org-list-struct))
|
||||
(prevs (org-list-struct-prev-alist struct))
|
||||
(prevs (org-list-prevs-alist struct))
|
||||
(s (concat (org-timer (when arg '(4)) t) ":: ")))
|
||||
(setq struct (org-list-insert-item-generic (point) struct prevs nil s))
|
||||
(org-list-struct-fix-struct struct (org-list-struct-parent-alist struct))
|
||||
(setq struct (org-list-insert-item (point) struct prevs nil s))
|
||||
(org-list-write-struct struct (org-list-parents-alist struct))
|
||||
(looking-at org-list-full-item-re)
|
||||
(goto-char (match-end 0))))
|
||||
;; In a list of another type, don't break anything: throw an error.
|
||||
|
|
10
lisp/org.el
10
lisp/org.el
|
@ -11821,7 +11821,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
|
|||
(if (looking-at "\n[ \t]*- State") (forward-char 1))
|
||||
(when (ignore-errors (goto-char (org-in-item-p)))
|
||||
(let* ((struct (org-list-struct))
|
||||
(prevs (org-list-struct-prev-alist struct)))
|
||||
(prevs (org-list-prevs-alist struct)))
|
||||
(while (looking-at "[ \t]*- State")
|
||||
(goto-char (or (org-list-get-next-item (point) struct prevs)
|
||||
(org-list-get-item-end (point) struct)))))))
|
||||
|
@ -17404,8 +17404,8 @@ This command does many different things, depending on context:
|
|||
(let* ((cbox (match-string 1))
|
||||
(struct (org-list-struct))
|
||||
(old-struct (mapcar (lambda (e) (copy-alist e)) struct))
|
||||
(parents (org-list-struct-parent-alist struct))
|
||||
(prevs (org-list-struct-prev-alist struct))
|
||||
(parents (org-list-parents-alist struct))
|
||||
(prevs (org-list-prevs-alist struct))
|
||||
(orderedp (ignore-errors (org-entry-get nil "ORDERED")))
|
||||
block-item)
|
||||
(org-list-set-checkbox (point-at-bol) struct
|
||||
|
@ -17430,8 +17430,8 @@ This command does many different things, depending on context:
|
|||
;; an argument
|
||||
(let* ((struct (org-list-struct))
|
||||
(old-struct (mapcar (lambda (e) (copy-alist e)) struct))
|
||||
(parents (org-list-struct-parent-alist struct))
|
||||
(prevs (org-list-struct-prev-alist struct)))
|
||||
(parents (org-list-parents-alist struct))
|
||||
(prevs (org-list-prevs-alist struct)))
|
||||
(org-list-struct-fix-ind struct parents)
|
||||
(org-list-struct-fix-bul struct prevs)
|
||||
(when arg
|
||||
|
|
Loading…
Reference in New Issue