From ba17f187726ffd48e951d82a77fb8a8e92117ec3 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 11 Feb 2015 14:32:57 -0800 Subject: [PATCH] require org and cl-lib; use cl-loop instead of loop --- org-ref.org | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/org-ref.org b/org-ref.org index b18d442..6124b7f 100644 --- a/org-ref.org +++ b/org-ref.org @@ -67,6 +67,8 @@ The only external require is reftex-cite (require 'dash) (require 'helm) (require 'helm-bibtex) +(require 'org) +(require 'cl-lib) #+END_SRC ** Custom variables @@ -610,7 +612,7 @@ environment, only %l is available." (file) (entry) (bibtex-entry) (entry-type) (format)) (setq file (catch 'result - (loop for file in org-ref-bibliography-files do + (cl-loop for file in org-ref-bibliography-files do (if (org-ref-key-in-file-p key (file-truename file)) (throw 'result file) (message "%s not found in %s" key (file-truename file)))))) @@ -700,7 +702,7 @@ First, we get the string for a single entry. (file) (entry) (bibtex-entry) (entry-type) (format)) (setq file (catch 'result - (loop for file in org-ref-bibliography-files do + (cl-loop for file in org-ref-bibliography-files do (if (org-ref-key-in-file-p key (file-truename file)) (throw 'result file) (message "%s not found in %s" key (file-truename file)))))) @@ -1404,7 +1406,7 @@ Use C-u C-u to insert a [[#custom-id]] link (helm :input (thing-at-point 'word) :sources `(((name . "Available labels to ref") - (candidates . ,(loop for label in labels + (candidates . ,(cl-loop for label in labels for context in contexts ;; we do some kludgy adding spaces ;; and bars to make it "easier" to @@ -1728,7 +1730,7 @@ Finally, we want to know which file the key is in. (unless key (setq key (org-ref-get-bibtex-key-under-cursor))) (setq file (catch 'result - (loop for file in org-ref-bibliography-files do + (cl-loop for file in org-ref-bibliography-files do (if (org-ref-key-in-file-p key (file-truename file)) (throw 'result file))))) (cons key file))) @@ -2429,7 +2431,7 @@ This assumes you are in an article." (bibtex-beginning-of-entry) (let* ((cb (current-buffer)) (bibtex-expand-strings t) - (entry (loop for (key . value) in (bibtex-parse-entry t) + (entry (cl-loop for (key . value) in (bibtex-parse-entry t) collect (cons (downcase key) value))) (title (replace-regexp-in-string "\n\\|\t\\|\s+" " " (reftex-get-bib-field "title" entry))) (year (reftex-get-bib-field "year" entry)) @@ -2457,7 +2459,7 @@ This assumes you are in an article." (bibtex-beginning-of-entry) (let* ((cb (current-buffer)) (bibtex-expand-strings t) - (entry (loop for (key . value) in (bibtex-parse-entry t) + (entry (cl-loop for (key . value) in (bibtex-parse-entry t) collect (cons (downcase key) value))) (title (replace-regexp-in-string "\n\\|\t\\|\s+" " " (reftex-get-bib-field "title" entry))) (year (reftex-get-bib-field "year" entry)) @@ -2514,7 +2516,7 @@ construct the heading by hand." (bibtex-beginning-of-entry) (let* ((cb (current-buffer)) (bibtex-expand-strings t) - (entry (loop for (key . value) in (bibtex-parse-entry t) + (entry (cl-loop for (key . value) in (bibtex-parse-entry t) collect (cons (downcase key) value))) (title (replace-regexp-in-string "\n\\|\t\\|\s+" " " (reftex-get-bib-field "title" entry))) (year (reftex-get-bib-field "year" entry)) @@ -3611,7 +3613,7 @@ Checks for pdf and doi, and add appropriate functions." (email-bibtex-entry)))) t) ;; finally return a numbered list of the candidates - (loop for i from 0 + (cl-loop for i from 0 for cell in candidates collect (cons (format "%2s. %s" i (car cell)) (cdr cell))))) -- 2.39.2