ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-element: Small refactoring 

* contrib/lisp/org-element.el (org-element-parse-elements): Small refactoring.
This commit is contained in:
Nicolas Goaziou 2012-02-23 19:08:23 +01:00
parent 07368bbc09
commit 186f0f7594
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/lisp/org-element.el
View File

@ -3173,12 +3173,13 @@ Elements are accumulated into ACC."
nil structure granularity visible-only (reverse element))) nil structure granularity visible-only (reverse element)))
;; 2. When ITEM is nil, find current element's type and parse ;; 2. When ITEM is nil, find current element's type and parse
;; it accordingly to its category. ;; it accordingly to its category.
(let ((element (org-element-current-element special structure))) (let* ((element (org-element-current-element special structure))
(type (org-element-type element)))
(goto-char (org-element-property :end element)) (goto-char (org-element-property :end element))
(cond (cond
;; Case 1. ELEMENT is a paragraph. Parse objects inside, ;; Case 1. ELEMENT is a paragraph. Parse objects inside,
;; if GRANULARITY allows it. ;; if GRANULARITY allows it.
((and (eq (org-element-type element) 'paragraph) ((and (eq type 'paragraph)
(or (not granularity) (eq granularity 'object))) (or (not granularity) (eq granularity 'object)))
(org-element-parse-objects (org-element-parse-objects
(org-element-property :contents-begin element) (org-element-property :contents-begin element)
@ -3190,10 +3191,10 @@ Elements are accumulated into ACC."
;; headline, in which case going inside is mandatory, in ;; headline, in which case going inside is mandatory, in
;; order to get sub-level headings. If VISIBLE-ONLY is ;; order to get sub-level headings. If VISIBLE-ONLY is
;; true and element is hidden, do not recurse into it. ;; true and element is hidden, do not recurse into it.
((and (memq (org-element-type element) org-element-greater-elements) ((and (memq type org-element-greater-elements)
(or (not granularity) (or (not granularity)
(memq granularity '(element object)) (memq granularity '(element object))
(eq (org-element-type element) 'headline)) (eq type 'headline))
(not (and visible-only (not (and visible-only
(org-element-property :hiddenp element)))) (org-element-property :hiddenp element))))
(org-element-parse-elements (org-element-parse-elements
@ -3202,7 +3203,7 @@ Elements are accumulated into ACC."
;; At a plain list, switch to item mode. At an ;; At a plain list, switch to item mode. At an
;; headline, switch to section mode. Any other ;; headline, switch to section mode. Any other
;; element turns off special modes. ;; element turns off special modes.
(case (org-element-type element) (case type
(plain-list 'item) (plain-list 'item)
(headline (if (org-element-property :quotedp element) (headline (if (org-element-property :quotedp element)
'quote-section 'quote-section