tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

org-list: make use of new `org-in-block-p' function

Browse source 
* lisp/org-list.el (org-list-in-valid-context-p): use `org-in-block-p'.
This commit is contained in:
Nicolas Goaziou 2011-07-08 16:12:35 +02:00
parent abe9550309
commit d29fcc50ea
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/org-list.el
View file

@ -106,9 +106,8 @@
(declare-function org-fix-tags-on-the-fly "org" ()) (declare-function org-fix-tags-on-the-fly "org" ())
(declare-function org-get-indentation "org" (&optional line)) (declare-function org-get-indentation "org" (&optional line))
(declare-function org-icompleting-read "org" (&rest args)) (declare-function org-icompleting-read "org" (&rest args))
(declare-function org-in-block-p "org" (names))
(declare-function org-in-regexp "org" (re &optional nlines visually)) (declare-function org-in-regexp "org" (re &optional nlines visually))
(declare-function org-in-regexps-block-p "org"
(start-re end-re &optional bound))
(declare-function org-inlinetask-goto-beginning "org-inlinetask" ()) (declare-function org-inlinetask-goto-beginning "org-inlinetask" ())
(declare-function org-inlinetask-goto-end "org-inlinetask" ()) (declare-function org-inlinetask-goto-end "org-inlinetask" ())
(declare-function org-inlinetask-in-task-p "org-inlinetask" ()) (declare-function org-inlinetask-in-task-p "org-inlinetask" ())
@ -410,15 +409,8 @@ group 4: description tag")
(looking-at regexp)))) (looking-at regexp))))
(defun org-list-in-valid-context-p () (defun org-list-in-valid-context-p ()
"Non-nil if point is in a valid block. "Is point in a context where lists are allowed?"
Invalid blocks are referring to `org-list-forbidden-blocks'." (not (org-in-block-p org-list-forbidden-blocks)))
(save-match-data
(let ((case-fold-search t))
(not (org-in-regexps-block-p
(concat "^[ \t]*#\\+begin_\\("
(mapconcat 'regexp-quote org-list-forbidden-blocks "\\|")
"\\)")
'(concat "^[ \t]*#\\+end_" (match-string 1)))))))
(defun org-in-item-p () (defun org-in-item-p ()
"Return item beginning position when in a plain list, nil otherwise. "Return item beginning position when in a plain list, nil otherwise.