From ec84430cf4e09ba25ec675debdf802bc28111e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Mon, 7 Nov 2016 10:41:54 +0100 Subject: Imported Upstream version 9.0 --- contrib/lisp/ox-bibtex.el | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'contrib/lisp/ox-bibtex.el') diff --git a/contrib/lisp/ox-bibtex.el b/contrib/lisp/ox-bibtex.el index 9d548bb..56dec38 100644 --- a/contrib/lisp/ox-bibtex.el +++ b/contrib/lisp/ox-bibtex.el @@ -92,7 +92,7 @@ ;; Initialization -(eval-when-compile (require 'cl)) +(require 'cl-lib) ;;; Internal Functions @@ -136,7 +136,7 @@ contains a list of strings to be passed as options to (defun org-bibtex-citation-p (object) "Non-nil when OBJECT is a citation." - (case (org-element-type object) + (cl-case (org-element-type object) (link (equal (org-element-property :type object) "cite")) (latex-fragment (string-match "\\`\\\\cite{" (org-element-property :value object))))) @@ -159,9 +159,7 @@ to `org-bibtex-citation-p' predicate." (defun org-bibtex-goto-citation (&optional citation) "Visit a citation given its ID." (interactive) - (let ((citation (or citation - (org-icompleting-read "Citation: " - (obe-citations))))) + (let ((citation (or citation (completing-read "Citation: " (obe-citations))))) (find-file (or org-bibtex-file (error "`org-bibtex-file' has not been configured"))) (goto-char (point-min)) @@ -169,7 +167,7 @@ to `org-bibtex-citation-p' predicate." (outline-previous-visible-heading 1) t))) -(let ((jump-fn (car (org-remove-if-not #'fboundp '(ebib org-bibtex-goto-citation))))) +(let ((jump-fn (car (cl-remove-if-not #'fboundp '(ebib org-bibtex-goto-citation))))) (org-add-link-type "cite" jump-fn)) @@ -305,7 +303,7 @@ the HTML and ASCII backends." next) (while (and (setq next (org-export-get-next-element object info)) (or (and (stringp next) - (not (org-string-match-p "\\S-" next))) + (not (string-match-p "\\S-" next))) (org-bibtex-citation-p next))) (unless (stringp next) (push (org-bibtex-get-citation-key next) keys)) -- cgit v1.2.3