emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/kind-icon a37db97 2/3: Remove svg-lib-icon in favor of


From: ELPA Syncer
Subject: [elpa] externals/kind-icon a37db97 2/3: Remove svg-lib-icon in favor of fboundp
Date: Thu, 18 Nov 2021 18:57:22 -0500 (EST)

branch: externals/kind-icon
commit a37db972169417c79fe106e32772274a48892b7b
Author: JD Smith <93749+jdtsmith@users.noreply.github.com>
Commit: JD Smith <93749+jdtsmith@users.noreply.github.com>

    Remove svg-lib-icon in favor of fboundp
---
 kind-icon.el | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/kind-icon.el b/kind-icon.el
index 6be669a..92b9ce8 100644
--- a/kind-icon.el
+++ b/kind-icon.el
@@ -79,8 +79,6 @@ An alist.")
   :set #'kind-icon--set-default-clear-cache
   :type 'boolean)
 
-(defvar svg-lib-icon)                  ;FIXME: This variable is not used here!?
-
 (defcustom kind-icon-mapping ;; adapted from company
   '((array "a" :icon "code-brackets" :face font-lock-type-face)
     (boolean "b" :icon "circle-half-full" :face font-lock-builtin-face)
@@ -180,16 +178,17 @@ See `svg-lib-style-compute-default'."
 
 (defun kind-icon--get-icon-safe (icon &optional col bg-col)
   "Retrieve ICON (a string) from the material database.
-Uses svg-lib, guarding against network errors."
-  (condition-case err
-      (apply #'svg-lib-icon icon nil
-            `(,@kind-icon-default-style
-              ,@(if col `(:foreground ,col))
-              ,@(if bg-col `(:background ,bg-col))))
-    ((error)
-     (warn "Error retrieving icon %s, falling back on short-text\n%s"
-          icon (cdr err))
-     nil)))
+Uses svg-lib, guarding against non-availability or network errors."
+  (if (fboundp 'svg-lib-icon)
+      (condition-case err
+         (apply #'svg-lib-icon icon nil
+                `(,@kind-icon-default-style
+                  ,@(if col `(:foreground ,col))
+                  ,@(if bg-col `(:background ,bg-col))))
+       ((error)
+        (warn "Error retrieving icon %s, falling back on short-text\n%s"
+              icon (cdr err))
+        nil))))
 
 (defun kind-icon--preview (widget _e)
   (let* ((icon-name (widget-value widget)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]