[elpa] externals/osm 699aae27b1 20/77: Rename osm-new to osm-home

[ELPA Syncer]

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

    Rename osm-new to osm-home
---
 README.org |  3 ++-
 osm.el     | 27 +++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.org b/README.org
index 68bab80c9e..2975cea138 100644
--- a/README.org
+++ b/README.org
@@ -26,7 +26,7 @@
 * Commands and Key Bindings
 
 Commands:
-- =osm-new=: Open new map at home coordinates
+- =osm-home=: Open new map at home coordinates
 - =osm-search=: Search and jump to location
 - =osm-goto=: Go to coordinates
 - =osm-server=: Select server
@@ -36,6 +36,7 @@ Key bindings:
 - ~<arrow>~: Small step scrolling
 - ~C-<arrow>~, ~M-<arrow>~: Large step scrolling
 - ~g~: =osm-goto=
+- ~h~: =osm-home=
 - ~s~: =osm-search=
 - ~S~: =osm-server=
 - ~b~: =bookmark-set=
diff --git a/osm.el b/osm.el
index 11eece996b..573b94353d 100644
--- a/osm.el
+++ b/osm.el
@@ -149,6 +149,7 @@ Should be at least 7 days according to the server usage 
policies."
     (define-key map [M-left] #'osm-left-large)
     (define-key map [M-right] #'osm-right-large)
     (define-key map "c" #'clone-buffer)
+    (define-key map "h" #'osm-home)
     (define-key map "g" #'osm-goto)
     (define-key map "s" #'osm-search)
     (define-key map "S" #'osm-server)
@@ -464,15 +465,15 @@ We need two distinct images which are not `eq' for the 
display properties.")
              image)))))))
 
 ;;;###autoload
-(defun osm-new (&optional unique)
-  "New OSM buffer, optionally UNIQUE."
-  (interactive "P")
+(defun osm-home ()
+  "New OSM buffer."
+  (interactive)
   (let ((lat (bound-and-true-p calendar-latitude))
         (lon (bound-and-true-p calendar-longitude))
         (zoom 11))
     (unless (and lat lon)
       (setq lat 0 lon 0 zoom 2))
-    (osm-goto lat lon zoom nil unique)))
+    (osm-goto lat lon zoom)))
 
 (defun osm--queue-info ()
   "Return queue info string."
@@ -547,9 +548,8 @@ We need two distinct images which are not `eq' for the 
display properties.")
     (handler . ,#'osm-bookmark-jump)))
 
 ;;;###autoload
-(defun osm-goto (lat lon zoom &optional name unique)
-  "Goto LAT/LON/ZOOM in buffer NAME.
-The buffer is optionally assigned a UNIQUE name."
+(defun osm-goto (lat lon zoom &optional name)
+  "Goto LAT/LON/ZOOM in buffer NAME."
   (interactive
    (pcase-let ((`(,lat ,lon ,zoom) (mapcar #'string-to-number (split-string 
(read-string "Lat Lon (Zoom): ") nil t))))
      (setq zoom (or zoom 11))
@@ -557,11 +557,9 @@ The buffer is optionally assigned a UNIQUE name."
        (error "Invalid coordindate"))
      (list lat lon zoom)))
   (with-current-buffer
-      (cond
-       ((and (not name) (not unique) (derived-mode-p #'osm-mode))
-        (current-buffer))
-       (unique (generate-new-buffer (or name (osm--buffer-name))))
-       (t (get-buffer-create (or name (osm--buffer-name)))))
+      (if (and (not name) (derived-mode-p #'osm-mode))
+          (current-buffer)
+        (generate-new-buffer (or name (osm--buffer-name))))
     (unless (derived-mode-p #'osm-mode)
       (osm-mode))
     (setq osm--zoom zoom)
@@ -581,7 +579,8 @@ The buffer is optionally assigned a UNIQUE name."
    (alist-get 'lat bm)
    (alist-get 'lon bm)
    (alist-get 'zoom bm)
-   (alist-get 'name bm)))
+   (unless (derived-mode-p #'osm-mode)
+     (alist-get 'name bm))))
 
 (defun osm--bookmark-name ()
   "Return bookmark name for current map."
@@ -661,7 +660,7 @@ The buffer is optionally assigned a UNIQUE name."
   (with-current-buffer
       (if (derived-mode-p #'osm-mode)
           (current-buffer)
-        (osm-new))
+        (osm-home))
     (unless (eq osm-server server)
       (let ((rename (string-match-p
                      (format "\\`\\*osm: %s\\*\\(?:<[0-9]+>\\)?\\'"