X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=blobdiff_plain;f=org-ref.el;h=86a3e5aa93654c19f0a5911c2d3e26025ee593f4;hp=aec69c79a3bbfe9390018725ddcebde8034919af;hb=669d2f3e9a8a033213dfefe40b380ab268962504;hpb=1b9bccec1f7b2ed242dd4e0abd4c43fa18b355e4

diff --git a/org-ref.el b/org-ref.el
index aec69c7..86a3e5a 100644
--- a/org-ref.el
+++ b/org-ref.el
@@ -626,6 +626,7 @@ Format according to the type in `org-ref-bibliography-entry-format'."
 		       (setq link-string-beginning (match-beginning 0))
 		       (setq link-string-end (match-end 0)))
 
+		     ;; Make sure point is in the link-path.
 		     (if (< cp link-string-beginning)
 			 (goto-char link-string-beginning))
 		     ;; We set the reftex-default-bibliography
@@ -726,20 +727,11 @@ Format according to the type in `org-ref-bibliography-entry-format'."
 		      ((eq format 'html) (org-ref-get-html-bibliography))
 		      ((eq format 'latex)
 		       ;; write out the latex bibliography command
-
-;		       (format "{\\setbox0\\vbox{\\bibliography{%s}}}"
-;			       (replace-regexp-in-string  "\\.bib" "" (mapconcat 'identity
-;										 (mapcar 'expand-file-name
-;											 (split-string keyword ","))
-;										 ",")))
-
 		       (format "\\nobibliography{%s}"
 			       (replace-regexp-in-string  "\\.bib" "" (mapconcat 'identity
 										 (mapcar 'expand-file-name
 											 (split-string keyword ","))
-										 ",")))
-
-		       ))))
+										 ",")))))))
 
 (org-add-link-type "printbibliography"
 		   (lambda (arg) (message "Nothing implemented for clicking here."))
@@ -749,8 +741,7 @@ Format according to the type in `org-ref-bibliography-entry-format'."
                       ((eq format 'html) (org-ref-get-html-bibliography))
 		      ((eq format 'latex)
 		       ;; write out the biblatex bibliography command
-		       "\\printbibliography"))
-))
+		       "\\printbibliography"))))
 
 (org-add-link-type "bibliographystyle"
 		   (lambda (arg) (message "Nothing implemented for clicking here."))
@@ -3072,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
@@ -3110,11 +3101,13 @@ In the helm-bibtex buffer, C-u will give you a helm menu to select a new link ty
 C-u C-u will change the key at point to the selected keys."
   (let* ((object (org-element-context))
 	 (last-char (save-excursion
-		      (goto-char (org-element-property :end object))
-		      (backward-char)
-		      (if (looking-at " ")
-			  " "
-			""))))
+		      (when (org-element-property :end object)
+			(goto-char (org-element-property :end object))
+			(unless (bobp)
+			  (backward-char))
+			(if (looking-at " ")
+			    " "
+			  "")))))
     (cond
      ;; case where we are in a link
      ((and (equal (org-element-type object) 'link)
@@ -3148,7 +3141,7 @@ C-u C-u will change the key at point to the selected keys."
      ;; We are next to a link, and we want to append
      ;; next to a link means one character back is on a link.
      ((save-excursion
-	(backward-char)
+	(unless (bobp) (backward-char))
 	(and (equal (org-element-type (org-element-context)) 'link)
 	     (-contains?
 	      org-ref-cite-types