Use string-match-p' instead of org-string-match-p'

* contrib/lisp/org-contacts.el (org-contacts-filter):
(org-contacts-complete-group):
(org-contacts-complete-tags-props):
* contrib/lisp/org-wl.el (org-wl-open):
* contrib/lisp/ox-bibtex.el (org-bibtex-merge-contiguous-citations):
* lisp/ob-core.el (org-babel-demarcate-block):
* lisp/ob-processing.el (org-babel-processing-view-sketch):
* lisp/ob-stan.el (org-babel-execute:stan):
* lisp/org-agenda.el (org-agenda-get-category-icon):
* lisp/org-clock.el (org-clock-into-drawer):
* lisp/org-element.el (org-element-link-parser):
* lisp/org-lint.el (org-lint-orphaned-affiliated-keywords):
(org-lint-invalid-babel-call-block):
(org-lint-colon-in-name):
* lisp/org-list.el (org-list-item-body-column):
* lisp/org-macro.el (org-macro-replace-all):
* lisp/org-plot.el (org-plot/gnuplot-script):
* lisp/org-table.el (org-table-export):
(org-table-align):
(org-table-get-range):
(org-table-recalculate):
(org-table-expand-lhs-ranges):
(org-table-formula-substitute-names):
(org-table-show-reference):
(orgtbl-to-texinfo):
(org-table-remote-reference-indirection):
* lisp/org.el (org-make-link-string):
(org--open-elisp-link):
(org-open-at-point):
(org-store-log-note):
(org-cached-entry-get):
(org--valid-property-p):
(org-entry-properties):
(org-buffer-property-keys):
(org-insert-drawer):
(org-display-inline-images):
(org-in-commented-heading-p):
* lisp/ox-ascii.el (org-ascii-keyword):
* lisp/ox-beamer.el (org-beamer--format-frame):
* lisp/ox-html.el (org-html-keyword):
* lisp/ox-latex.el (org-latex--label):
(org-latex-headline):
(org-latex-item):
(org-latex-keyword):
(org-latex--inline-image):
(org-latex-src-block):
* lisp/ox-odt.el (org-odt-styles-dir):
(org-odt-keyword):
(org-odt--translate-latex-fragments):
* lisp/ox-texinfo.el (org-texinfo-template):
(org-texinfo-keyword):
(org-texinfo-src-block):
* lisp/ox.el (org-export-inline-image-p):
(org-export-file-uri):
* testing/lisp/test-org-table.el (test-org-table/to-generic):
(test-org-table/to-latex):
(test-org-table/to-html):
(test-org-table/named-field):
(test-org-table/named-column):
(test-org-table/tab-indent):
(test-org-table/first-rc):
(test-org-table/last-rc): Use `string-match-p' instead of
`org-string-match-p'.
This commit is contained in:
Nicolas Goaziou 2016-07-25 15:21:12 +02:00
parent 0ec6917ed8
commit f07048b75d

View file

@ -317,16 +317,16 @@ cell corresponding to the contact properties.
(cl-loop for contact in (org-contacts-db) (cl-loop for contact in (org-contacts-db)
if (or if (or
(and name-match (and name-match
(org-string-match-p name-match (string-match-p name-match
(first contact))) (first contact)))
(and prop-match (and prop-match
(cl-find-if (lambda (prop) (cl-find-if (lambda (prop)
(and (string= (car prop-match) (car prop)) (and (string= (car prop-match) (car prop))
(org-string-match-p (cdr prop-match) (cdr prop)))) (string-match-p (cdr prop-match) (cdr prop))))
(caddr contact))) (caddr contact)))
(and tags-match (and tags-match
(cl-find-if (lambda (tag) (cl-find-if (lambda (tag)
(org-string-match-p tags-match tag)) (string-match-p tags-match tag))
(org-split-string (org-split-string
(or (cdr (assoc-string "ALLTAGS" (caddr contact))) "") ":")))) (or (cdr (assoc-string "ALLTAGS" (caddr contact))) "") ":"))))
collect contact))) collect contact)))
@ -505,7 +505,7 @@ prefixes rather than just the beginning of the string."
A group FOO is composed of contacts with the tag FOO." A group FOO is composed of contacts with the tag FOO."
(let* ((completion-ignore-case org-contacts-completion-ignore-case) (let* ((completion-ignore-case org-contacts-completion-ignore-case)
(group-completion-p (org-string-match-p (group-completion-p (string-match-p
(concat "^" org-contacts-group-prefix) string))) (concat "^" org-contacts-group-prefix) string)))
(when group-completion-p (when group-completion-p
(let ((completion-list (let ((completion-list
@ -554,7 +554,7 @@ with BAR.
See (org) Matching tags and properties for a complete See (org) Matching tags and properties for a complete
description." description."
(let* ((completion-ignore-case org-contacts-completion-ignore-case) (let* ((completion-ignore-case org-contacts-completion-ignore-case)
(completion-p (org-string-match-p (completion-p (string-match-p
(concat "^" org-contacts-tags-props-prefix) string))) (concat "^" org-contacts-tags-props-prefix) string)))
(when completion-p (when completion-p
(let ((result (let ((result