From 66767db56ca05f68573993c23665e808fe2f3d65 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 17 Jul 2012 20:49:31 +0200 Subject: [PATCH] org-export: Replace member with memq when possible * contrib/lisp/org-element.el (org-element-set-element): Replace member with memq. * contrib/lisp/org-export.el (org-export-get-min-level, org-export--skip-p, org-export-data, org-export-table-cell-width, org-export-table-cell-alignment): Replace member with memq. --- contrib/lisp/org-element.el | 2 +- contrib/lisp/org-export.el | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/lisp/org-element.el b/contrib/lisp/org-element.el index 80da2b047..2b06d6e11 100644 --- a/contrib/lisp/org-element.el +++ b/contrib/lisp/org-element.el @@ -391,7 +391,7 @@ The function takes care of setting `:parent' property for NEW." (sec-loc (cdr (assq (org-element-type parent) org-element-secondary-value-alist))) (sec-value (and sec-loc (org-element-property sec-loc parent))) - (place (or (member old sec-value) (member old parent)))) + (place (or (memq old sec-value) (memq old parent)))) ;; Make sure NEW has correct `:parent' property. (org-element-put-property new :parent parent) ;; Replace OLD with NEW in PARENT. diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index ceb9c3be8..d73c09992 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -1523,7 +1523,7 @@ OPTIONS is a plist holding export options." (mapc (lambda (blob) (when (and (eq (org-element-type blob) 'headline) - (not (member blob (plist-get options :ignore-list)))) + (not (memq blob (plist-get options :ignore-list)))) (setq min-level (min (org-element-property :level blob) min-level))) (when (= min-level 1) (throw 'exit 1))) @@ -1636,7 +1636,7 @@ tag." thereis (member k tags)) ;; When a select tag is present in the buffer, ignore any tree ;; without it. - (and selected (not (member blob selected))) + (and selected (not (memq blob selected))) ;; Ignore commented sub-trees. (org-element-property :commentedp blob) ;; Ignore archived subtrees if `:with-archived-trees' is nil. @@ -1721,7 +1721,7 @@ Return transcoded string." (results (cond ;; Ignored element/object. - ((member data (plist-get info :ignore-list)) nil) + ((memq data (plist-get info :ignore-list)) nil) ;; Plain text. ((eq type 'plain-text) (org-export-filter-apply-functions @@ -3559,7 +3559,7 @@ Return value is the width given by the last width cookie in the same column as TABLE-CELL, or nil." (let* ((row (org-export-get-parent table-cell)) (column (let ((cells (org-element-contents row))) - (- (length cells) (length (member table-cell cells))))) + (- (length cells) (length (memq table-cell cells))))) (table (org-export-get-parent-table table-cell)) cookie-width) (mapc @@ -3596,7 +3596,7 @@ column (see `org-table-number-fraction' for more information). Possible values are `left', `right' and `center'." (let* ((row (org-export-get-parent table-cell)) (column (let ((cells (org-element-contents row))) - (- (length cells) (length (member table-cell cells))))) + (- (length cells) (length (memq table-cell cells))))) (table (org-export-get-parent-table table-cell)) (number-cells 0) (total-cells 0) @@ -3669,7 +3669,7 @@ Returned borders ignore special rows." (if rule-flag (throw 'exit (push 'above borders)) (throw 'exit nil))))) ;; Look at every row before the current one. - (cdr (member row (reverse (org-element-contents table))))) + (cdr (memq row (reverse (org-element-contents table))))) ;; No rule above, or rule found starts the table (ignoring any ;; special row): TABLE-CELL is at the top of the table. (when rule-flag (push 'above borders)) @@ -3685,7 +3685,7 @@ Returned borders ignore special rows." (if rule-flag (throw 'exit (push 'below borders)) (throw 'exit nil))))) ;; Look at every row after the current one. - (cdr (member row (org-element-contents table)))) + (cdr (memq row (org-element-contents table)))) ;; No rule below, or rule found ends the table (modulo some ;; special row): TABLE-CELL is at the bottom of the table. (when rule-flag (push 'below borders)) @@ -3696,7 +3696,7 @@ Returned borders ignore special rows." ;; cells. (catch 'exit (let ((column (let ((cells (org-element-contents row))) - (- (length cells) (length (member table-cell cells)))))) + (- (length cells) (length (memq table-cell cells)))))) (mapc (lambda (row) (unless (eq (org-element-property :type row) 'rule)