Merge branch 'master' of github.com:jkitchin/org-ref

diff --git a/arxiv.el b/arxiv.el
index 783719535f48a44cc58da1b8a0a6735b6a4f268b..5b4a8e0427cdf6600a73aa94dfe5f1e134c0138e 100644 (file)
--- a/arxiv.el
+++ b/arxiv.el
@@ -79,7 +79,7 @@
 (defun arxiv-add-bibtex-entry (arxiv-number bibfile)
   "Add bibtex entry for ARXIV-NUMBER to BIBFILE."
  (interactive
-   (list (read-input "arxiv: ")
+   (list (read-string "arxiv: ")
         ;;  now get the bibfile to add it to
         (ido-completing-read
          "Bibfile: "

diff --git a/doi-utils.el b/doi-utils.el
index e3e8b94cb86866433ee5b95c46033912835fa22f..a0af934848d07bb6ec133d9870c1cef5bca05d33 100644 (file)
--- a/doi-utils.el
+++ b/doi-utils.el
@@ -530,7 +530,7 @@ prompt. If no region is selected and the first entry of the
 kill-ring starts like a DOI, then that is the intial
 prompt. Otherwise, you have to type or pste in a DOI."
   (interactive
-   (list (read-input "DOI: "
+   (list (read-string "DOI: "
                     ;; now set initial input
                     (cond
                      ;; If region is active and it starts like a doi we want it.
@@ -917,7 +917,7 @@ error."
 (defun doi-utils-add-entry-from-crossref-query (query bibtex-file)
   "Search Crossref with QUERY and use helm to select an entry to add to BIBTEX-FILE."
   (interactive (list
-               (read-input
+               (read-string
                 "Query: "
                 ;; now set initial input
                 (cond

diff --git a/isbn.el b/isbn.el
index b70ced252602af2d6e5a22a39da902f6c18d2a80..cb73f6852f5ed5c861666e4a82c58e3104169a57 100644 (file)
--- a/isbn.el
+++ b/isbn.el
@@ -46,7 +46,7 @@ file."
 entry with the generated key already exists in the file."
   (interactive
    (list
-    (read-input
+    (read-string
      "ISBN: "
      ;; now set initial input
      (cond
@@ -104,7 +104,7 @@ entry with the generated key already exists in the file."
     (goto-char (point-min))
     (when (search-forward new-key nil t)
       (beep)
-      (setq new-key (read-input
+      (setq new-key (read-string
                     (format  "%s already exists. Enter new key (C-g to cancel): " new-key)
                     new-key)))
     (goto-char (point-max))

diff --git a/jmax-bibtex.el b/jmax-bibtex.el
index f728d582e47ea58993dafa5632ae1596f2945f0b..066c406f4114eb3f3ee5338b418739caa24b4bc9 100644 (file)
--- a/jmax-bibtex.el
+++ b/jmax-bibtex.el
@@ -534,8 +534,8 @@ _u_: Update field _F_: file funcs
    ("K" (lambda ()
          (interactive)
          (org-ref-set-bibtex-keywords
-          (read-input "Keywords: "
-                      (bibtex-autokey-get-field "keywords"))
+          (read-string "Keywords: "
+                       (bibtex-autokey-get-field "keywords"))
           t)))
    ("b" org-ref-open-in-browser)
    ("r" (lambda () (interactive)

diff --git a/org-ref.el b/org-ref.el
index 7a54058c150a8eee5c0ded7fbf7f17de85fcc888..86a3e5aa93654c19f0a5911c2d3e26025ee593f4 100644 (file)
--- a/org-ref.el
+++ b/org-ref.el
@@ -3063,7 +3063,7 @@ first key that partially matches.  This version avoids that."
 User is prompted for tags.  This function is called from `helm-bibtex'.
 Argument CANDIDATES helm candidates."
   (message "")
-  (let ((keywords (read-input "Keywords (comma separated): ")))
+  (let ((keywords (read-string "Keywords (comma separated): ")))
     (loop for key in (helm-marked-candidates)
          do
          (save-window-excursion