|
@@ -217,7 +217,8 @@ Valid values are ?. and ?\). To get both terminators, use t."
|
|
|
(const :tag "paren like in \"2)\"" ?\))
|
|
|
(const :tag "both" t)))
|
|
|
|
|
|
-(org-defvaralias 'org-alphabetical-lists 'org-list-allow-alphabetical) ;; Since 8.0
|
|
|
+(define-obsolete-variable-alias 'org-alphabetical-lists
|
|
|
+ 'org-list-allow-alphabetical "24.4") ; Since 8.0
|
|
|
(defcustom org-list-allow-alphabetical nil
|
|
|
"Non-nil means single character alphabetical bullets are allowed.
|
|
|
Both uppercase and lowercase are handled. Lists with more than
|
|
@@ -239,8 +240,8 @@ spaces instead of one after the bullet in each item of the list."
|
|
|
(const :tag "never" nil)
|
|
|
(regexp)))
|
|
|
|
|
|
-(org-defvaralias 'org-empty-line-terminates-plain-lists
|
|
|
- 'org-list-empty-line-terminates-plain-lists) ;; Since 8.0
|
|
|
+(define-obsolete-variable-alias 'org-empty-line-terminates-plain-lists
|
|
|
+ 'org-list-empty-line-terminates-plain-lists "24.4") ;; Since 8.0
|
|
|
(defcustom org-list-empty-line-terminates-plain-lists nil
|
|
|
"Non-nil means an empty line ends all plain list levels.
|
|
|
Otherwise, two of them will be necessary."
|
|
@@ -293,8 +294,8 @@ This hook runs even if checkbox rule in
|
|
|
implement alternative ways of collecting statistics
|
|
|
information.")
|
|
|
|
|
|
-(org-defvaralias 'org-hierarchical-checkbox-statistics
|
|
|
- 'org-checkbox-hierarchical-statistics) ;; Since 8.0
|
|
|
+(define-obsolete-variable-alias 'org-hierarchical-checkbox-statistics
|
|
|
+ 'org-checkbox-hierarchical-statistics "24.4") ;; Since 8.0
|
|
|
(defcustom org-checkbox-hierarchical-statistics t
|
|
|
"Non-nil means checkbox statistics counts only the state of direct children.
|
|
|
When nil, all boxes below the cookie are counted.
|
|
@@ -363,10 +364,10 @@ specifically, type `block' is determined by the variable
|
|
|
|
|
|
;;; Predicates and regexps
|
|
|
|
|
|
-(defconst org-list-end-re (if org-empty-line-terminates-plain-lists "^[ \t]*\n"
|
|
|
+(defconst org-list-end-re (if org-list-empty-line-terminates-plain-lists "^[ \t]*\n"
|
|
|
"^[ \t]*\n[ \t]*\n")
|
|
|
"Regex corresponding to the end of a list.
|
|
|
-It depends on `org-empty-line-terminates-plain-lists'.")
|
|
|
+It depends on `org-list-empty-line-terminates-plain-lists'.")
|
|
|
|
|
|
(defconst org-list-full-item-re
|
|
|
(concat "^[ \t]*\\(\\(?:[-+*]\\|\\(?:[0-9]+\\|[A-Za-z]\\)[.)]\\)\\(?:[ \t]+\\|$\\)\\)"
|
|
@@ -386,7 +387,7 @@ group 4: description tag")
|
|
|
((= org-plain-list-ordered-item-terminator ?\)) ")")
|
|
|
((= org-plain-list-ordered-item-terminator ?.) "\\.")
|
|
|
(t "[.)]")))
|
|
|
- (alpha (if org-alphabetical-lists "\\|[A-Za-z]" "")))
|
|
|
+ (alpha (if org-list-allow-alphabetical "\\|[A-Za-z]" "")))
|
|
|
(concat "\\([ \t]*\\([-+]\\|\\(\\([0-9]+" alpha "\\)" term
|
|
|
"\\)\\)\\|[ \t]+\\*\\)\\([ \t]+\\|$\\)")))
|
|
|
|
|
@@ -400,7 +401,7 @@ group 4: description tag")
|
|
|
(save-excursion
|
|
|
(goto-char (match-end 0))
|
|
|
(let ((counter-re (concat "\\(?:\\[@\\(?:start:\\)?"
|
|
|
- (if org-alphabetical-lists
|
|
|
+ (if org-list-allow-alphabetical
|
|
|
"\\([0-9]+\\|[A-Za-z]\\)"
|
|
|
"[0-9]+")
|
|
|
"\\][ \t]*\\)")))
|
|
@@ -1208,7 +1209,7 @@ some heuristics to guess the result."
|
|
|
(point))))))))
|
|
|
(cond
|
|
|
;; Trivial cases where there should be none.
|
|
|
- ((or org-empty-line-terminates-plain-lists (not insert-blank-p)) 0)
|
|
|
+ ((or org-list-empty-line-terminates-plain-lists (not insert-blank-p)) 0)
|
|
|
;; When `org-blank-before-new-entry' says so, it is 1.
|
|
|
((eq insert-blank-p t) 1)
|
|
|
;; `plain-list-item' is 'auto. Count blank lines separating
|
|
@@ -1613,7 +1614,7 @@ bullets between START and END."
|
|
|
|
|
|
STRUCT is list structure. PREVS is the alist of previous items,
|
|
|
as returned by `org-list-prevs-alist'."
|
|
|
- (and org-alphabetical-lists
|
|
|
+ (and org-list-allow-alphabetical
|
|
|
(catch 'exit
|
|
|
(let ((item first) (ascii 64) (case-fold-search nil))
|
|
|
;; Pretend that bullets are uppercase and check if alphabet
|
|
@@ -2429,7 +2430,7 @@ With optional prefix argument ALL, do this for the whole buffer."
|
|
|
(let ((cookie-re "\\(\\(\\[[0-9]*%\\]\\)\\|\\(\\[[0-9]*/[0-9]*\\]\\)\\)")
|
|
|
(box-re "^[ \t]*\\([-+*]\\|\\([0-9]+\\|[A-Za-z]\\)[.)]\\)[ \t]+\\(?:\\[@\\(?:start:\\)?\\([0-9]+\\|[A-Za-z]\\)\\][ \t]*\\)?\\(\\[[- X]\\]\\)")
|
|
|
(recursivep
|
|
|
- (or (not org-hierarchical-checkbox-statistics)
|
|
|
+ (or (not org-checkbox-hierarchical-statistics)
|
|
|
(string-match "\\<recursive\\>"
|
|
|
(or (org-entry-get nil "COOKIE_DATA") ""))))
|
|
|
(bounds (if all
|