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

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

[elpa] externals/osm 05ac461360: Bail out earlier if dependencies are mi


From: ELPA Syncer
Subject: [elpa] externals/osm 05ac461360: Bail out earlier if dependencies are missing
Date: Tue, 10 May 2022 15:57:50 -0400 (EDT)

branch: externals/osm
commit 05ac461360f32692f91305e9b42726334fcc81da
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Bail out earlier if dependencies are missing
---
 osm.el | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/osm.el b/osm.el
index 299408197c..742438e8f1 100644
--- a/osm.el
+++ b/osm.el
@@ -47,6 +47,22 @@
   (require 'cl-lib)
   (require 'subr-x))
 
+;; Check that Emacs is compiled with the necessary libraries.
+(let (req)
+  (unless (display-graphic-p)
+    (push "graphical display" req))
+  (dolist (type '(svg jpeg png))
+    (unless (image-type-available-p type)
+      (push (format "%s support" type) req)))
+  (unless (libxml-available-p)
+    (push "libxml" req))
+  ;; json-available-p is not available on Emacs 27
+  (unless (ignore-errors (equal [] (json-parse-string "[]")))
+    (push "libjansson" req))
+  (when req
+    (error "Osm: Please compile Emacs with the required libraries, %s needed 
to proceed"
+           (string-join req ", "))))
+
 (defgroup osm nil
   "OpenStreetMap viewer."
   :group 'web
@@ -746,27 +762,9 @@ Should be at least 7 days according to the server usage 
policies."
                   (* 60 60 24 osm-max-age))
            (delete-file file)))))))
 
-(defun osm--check-libraries ()
-  "Check that Emacs is compiled with the necessary libraries."
-  (let (req)
-    (unless (display-graphic-p)
-      (push "graphical display" req))
-    (dolist (type '(svg jpeg png))
-      (unless (image-type-available-p type)
-        (push (format "%s support" type) req)))
-    (unless (libxml-available-p)
-      (push "libxml" req))
-    ;; json-available-p is not available on Emacs 27
-    (unless (ignore-errors (equal [] (json-parse-string "[]")))
-      (push "libjansson" req))
-    (when req
-      (error "Osm: Please compile Emacs with the required libraries, %s needed 
to proceed"
-             (string-join req ", ")))))
-
 (define-derived-mode osm-mode special-mode "Osm"
   "OpenStreetMap viewer mode."
   :interactive nil
-  (osm--check-libraries)
   (setq-local osm-server osm-server
               line-spacing nil
               cursor-type nil



reply via email to

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