[elpa] externals/osm d776cdb343 42/77: Fix melpa issues (See https://github.com/melpa/melpa/pull/7936)

[ELPA Syncer]

branch: externals/osm
commit d776cdb343d52ce6d712f7f13c3153060fc01f27
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>

    Fix melpa issues (See https://github.com/melpa/melpa/pull/7936)
---
 ol-osm.el => osm-ol.el | 14 +++++++-------
 osm.el                 |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ol-osm.el b/osm-ol.el
similarity index 89%
rename from ol-osm.el
rename to osm-ol.el
index 4234b84518..b4ae528155 100644
--- a/ol-osm.el
+++ b/osm-ol.el
@@ -1,4 +1,4 @@
-;;; ol-osm.el --- Org links for `osm-mode' -*- lexical-binding: t -*-
+;;; osm-ol.el --- Org links for `osm-mode' -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2022 Daniel Mendler
 
@@ -31,10 +31,10 @@
 
 (org-link-set-parameters
  "osm"
- :follow #'ol-osm-open
- :store #'ol-osm-store)
+ :follow #'osm-ol-open
+ :store #'osm-ol-store)
 
-(defun ol-osm-open (link _)
+(defun osm-ol-open (link _)
   "Open osm LINK."
   (save-match-data
     (unless (string-match
@@ -47,7 +47,7 @@
                (string-to-number (match-string 4 link)))
      :server (and (match-end 1) (intern (match-string 1 link))))))
 
-(defun ol-osm-store ()
+(defun osm-ol-store ()
   "Store osm link."
   (when (derived-mode-p 'osm-mode)
     (pcase-let ((`(,lat ,lon ,zoom ,server ,desc) (osm--link-data)))
@@ -59,5 +59,5 @@
               (if server (format "%s:" server) "")
               lat lon zoom)))))
 
-(provide 'ol-osm)
-;;; ol-osm.el ends here
+(provide 'osm-ol)
+;;; osm-ol.el ends here
diff --git a/osm.el b/osm.el
index e864e0e469..02bbce9c10 100644
--- a/osm.el
+++ b/osm.el
@@ -110,7 +110,7 @@
   :type 'symbol)
 
 (defcustom osm-cache-directory
-  (file-name-concat user-emacs-directory "var/osm/")
+  (expand-file-name "var/osm/" user-emacs-directory)
   "Tile cache directory."
   :type 'string)
 
@@ -435,6 +435,7 @@ We need two distinct images which are not `eq' for the 
display properties.")
                   (* 60 60 24 osm-max-age))
            (delete-file file)))))))
 
+(defvar bookmark-make-record-function)
 (define-derived-mode osm-mode special-mode "Osm"
   "OpenStreetMap viewer mode."
   :interactive nil
@@ -538,7 +539,7 @@ We need two distinct images which are not `eq' for the 
display properties.")
         '(:eval (osm--queue-info))))
       (erase-buffer)
       (dotimes (_j osm--ny)
-        (insert (concat (make-string osm--nx ?\s) "\n")))
+        (insert (make-string osm--nx ?\s) "\n"))
       (goto-char (point-min))
       (dotimes (j osm--ny)
         (dotimes (i osm--nx)