update packages

lisp/org-ref/org-ref-ivy.el

@@ -28,9 +28,22 @@
 ;; citation selection looks like `ivy-bibtex' but it is a customized ivy
 ;; function with customized actions.
 
+;; ivy-bibtex is optional, and it causes compiling errors if not installed. I
+;; think this might fix that.
+(when (and (bound-and-true-p byte-compile-current-file)
+           (not (locate-library "ivy-bibtex")))
+  (message "org-ref-ivy: skipping byte-compile; ivy-bibtex not installed.")
+  (setq byte-compile-current-file nil)
+  (throw 'byte-compile-top-level nil))
+
+
 (require 'org-ref-core)
 (require 'ivy-bibtex)
 
+;; Declare variable before any potential use (including in macros)
+;; Initialize with nil to avoid "void variable" error
+(defvar org-ref-citation-alternate-insert-actions nil
+  "Actions for ivy citation insertion. Set by defcustom below.")
 
 ;; all these functions are defined in ivy-bibtex, but not in a variable. Here
 ;; you can set them as you see fit.
@@ -79,7 +92,7 @@
   (let* ((width (- (frame-width) 2))
 	 (idx (get-text-property 1 'idx candidate))
 	 (entry (cdr (nth idx (ivy-state-collection ivy-last)))))
-    (s-concat (if (s-starts-with-p ivy-mark-prefix candidate) ivy-mark-prefix "")
+    (concat (if (string-prefix-p ivy-mark-prefix candidate) ivy-mark-prefix "")
 	      (bibtex-completion-format-entry entry width))))