X-Git-Url: https://git.donarmstrong.com/?p=org-ref.git;a=blobdiff_plain;f=org-ref.org;h=db0e205a640c15f9b5c004c4bcf59adf8a33d4fc;hp=40a29405d95a0e3a849003c180917238c95486c5;hb=a6303d3c099b45c9baf63a60c2b9e9140daa0e3c;hpb=50440af50787febd2d7797ff722a9d107416a98a

diff --git a/org-ref.org b/org-ref.org
index 40a2940..db0e205 100644
--- a/org-ref.org
+++ b/org-ref.org
@@ -3069,13 +3069,6 @@ To get a lighter weight message about the label, ref and cite links, we define a
 			(progn
 			  (forward-line 4)
 			  (point)))))
-
-      ;; maybe we have a CUSTOM-ID
-      (org-map-entries
-       (lambda () (when (string=
-			 label
-			 (org-entry-get (point) "CUSTOM_ID"))
-		    (throw 'result (org-get-heading)))))
       (beep)
       (throw 'result "!!! NO CONTEXT FOUND !!!"))))
 
@@ -3122,24 +3115,26 @@ To get a lighter weight message about the label, ref and cite links, we define a
 		 (link-string (org-element-property :path object))
 		 (link-string-beginning)
 		 (link-string-end))
-
 	    (save-excursion
 	      (goto-char (org-element-property :begin object))
 	      (search-forward link-string nil nil 1)
 	      (setq link-string-beginning (match-beginning 0))
 	      (setq link-string-end (match-end 0)))
 
+	     ;; make sure we are in link and not before the :
+	    (when (> link-string-beginning (point))
+	      (goto-char link-string-beginning))
+
 	    ;; now if we have comma separated bibliographies
 	    ;; we find the one clicked on. we want to
 	    ;; search forward to next comma from point
 	    (save-excursion
-              (goto-char link-string-beginning)
 	      (if (search-forward "," link-string-end 1 1)
 		  (setq key-end (- (match-end 0) 1)) ; we found a match
 		(setq key-end (point)))) ; no comma found so take the point
+
 	    ;; and backward to previous comma from point
 	    (save-excursion
-              (goto-char link-string-beginning)
 	      (if (search-backward "," link-string-beginning 1 1)
 		  (setq key-beginning (+ (match-beginning 0) 1)) ; we found a match
 		(setq key-beginning (point)))) ; no match found