[elpa] externals/osm 037d0213ac 2/6: Improve transient pin handling

[ELPA Syncer]

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

    Improve transient pin handling
---
 README.org |  4 ++--
 osm.el     | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.org b/README.org
index d57feaee86..bc87ee8f0b 100644
--- a/README.org
+++ b/README.org
@@ -40,7 +40,7 @@ take a look at the 
[[https://github.com/minad/osm/wiki][wiki]] for additional co
            ("C-c m s" . osm-search)
            ("C-c m t" . osm-server)
            ("C-c m g" . osm-goto)
-           ("C-c m b" . osm-bookmark-jump))
+           ("C-c m j" . osm-bookmark-jump))
     :init
     ;; Load Org link support
     (with-eval-after-load 'org
@@ -89,7 +89,7 @@ Key bindings in =osm-mode= buffer:
 - ~t~: =osm-server= - Select tile server
 - ~l~: =org-store-link= - Store org link
 - ~b~: =osm-bookmark-set= - Set bookmark
-- ~B~: =osm-bookmark-jump= - Jump to bookmark
+- ~j~: =osm-bookmark-jump= - Jump to bookmark
 - ~q~: =quit-window= - Close buffer and window
 - ~c~: =clone-buffer= - Clone buffer
 
diff --git a/osm.el b/osm.el
index 229d3611b1..0c79452f24 100644
--- a/osm.el
+++ b/osm.el
@@ -176,8 +176,8 @@ Should be at least 7 days according to the server usage 
policies."
     (define-key map "s" #'osm-search)
     (define-key map "t" #'osm-server)
     (define-key map "l" 'org-store-link)
-    (define-key map "B" #'osm-bookmark-set)
-    (define-key map "b" #'osm-bookmark-jump)
+    (define-key map "b" #'osm-bookmark-set)
+    (define-key map "j" #'osm-bookmark-jump)
     (define-key map [remap scroll-down-command] #'osm-down)
     (define-key map [remap scroll-up-command] #'osm-up)
     (define-key map "<" nil)
@@ -875,19 +875,22 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
         (sym (make-symbol "osm--remove-transient-pin")))
     (fset sym (lambda ()
                 (with-current-buffer buffer
-                  (remove-hook 'pre-command-hook sym)
-                  ;; HACK: handle bookmark deletion and renaming
+                  ;; Handle bookmark deletion and renaming
                   (pcase this-command
+                    ('undefined nil)
                     ((and (guard (eq id 'selected-bookmark))
                           cmd (or 'osm-bookmark-delete 'osm-bookmark-rename))
+                     (remove-hook 'pre-command-hook sym)
                      (setq osm--transient-pin nil
                            this-command
                            (lambda ()
                              (interactive)
                              (funcall cmd help))))
-                    ((guard osm--transient-pin)
-                     (setq osm--transient-pin nil)
-                     (osm--update))))))
+                    (_
+                     (remove-hook 'pre-command-hook sym)
+                     (when osm--transient-pin
+                       (setq osm--transient-pin nil)
+                       (osm--update)))))))
     (add-hook 'pre-command-hook sym)
     (setq osm--transient-pin (list id x y help))))