[elpa] externals/eev updated (8ed988fbca -> c09eca9d35)

[ELPA Syncer]

elpasync pushed a change to branch externals/eev.

  from  8ed988fbca Rewrote eev-kla.el almost completely.
   new  e4e49af92a Bumped the version in eev.el (for a workshop).
   new  c09eca9d35 Bumped the version in eev.el (for a workshop).


Summary of changes:
 VERSION | 4 ++--
 eev.el  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[elpa] externals/eev c09eca9d35 2/2: Bumped the version in eev.el (for a workshop).

[ELPA Syncer]

branch: externals/eev
commit c09eca9d355bc7c867fcb29c04ff9da34964980f
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Bumped the version in eev.el (for a workshop).
---
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 3971924829..0ef0cb6b02 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Tue Mar  8 08:44:31 GMT 2022
-Tue Mar  8 05:44:31 -03 2022
+Tue Mar  8 08:46:02 GMT 2022
+Tue Mar  8 05:46:02 -03 2022

[elpa] externals/eev e4e49af92a 1/2: Bumped the version in eev.el (for a workshop).

[ELPA Syncer]

branch: externals/eev
commit e4e49af92a69bfd45cb201c786757f72ece7b520
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Bumped the version in eev.el (for a workshop).
---
 VERSION | 4 ++--
 eev.el  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 59dd71dcd6..3971924829 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Mon Mar  7 04:36:03 GMT 2022
-Mon Mar  7 01:36:03 -03 2022
+Tue Mar  8 08:44:31 GMT 2022
+Tue Mar  8 05:44:31 -03 2022
diff --git a/eev.el b/eev.el
index 86e363129c..79fc4281b5 100644
--- a/eev.el
+++ b/eev.el
@@ -6,7 +6,7 @@
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: lisp e-scripts
 ;; URL: http://angg.twu.net/#eev
-;; Version: 20220224
+;; Version: 20220308
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

[elpa] externals/osm bcad977316 3/4: Minor optimization

[ELPA Syncer]

branch: externals/osm
commit bcad97731686229e59ffc42cc8ae3c16a8066341
Author: Daniel Mendler 
Commit: Daniel Mendler 

Minor optimization
---
 osm.el | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osm.el b/osm.el
index 4584c03d72..11aa677117 100644
--- a/osm.el
+++ b/osm.el
@@ -553,6 +553,12 @@ Should be at least 7 days according to the server usage 
policies."
   bookmark-make-record-function #'osm--make-bookmark)
   (add-hook 'window-size-change-functions #'osm--resize nil 'local))
 
+(defun osm--pin-at-p (x y p q)
+  "Return non-nil if pin P/Q is inside tile X/Y."
+  (setq x (* x 256) y (* y 256))
+  (and (>= p (- x 32)) (< p (+ x 256 32))
+   (>= q (- y 64)) (< q (+ y 256 ;; no + 64 here!
+
 (defun osm--put-pin (id x y color help)
   "Put pin at X/Y with COLOR, HELP and ID in pins hash table."
   (let ((x0 (/ x 256)) (y0 (/ y 256)))
@@ -561,8 +567,8 @@ Should be at least 7 days according to the server usage 
policies."
 (cl-loop
  for i from -1 to 1 do
  (cl-loop
-  for j from -1 to 1 do
-  (let ((x1 (/ (+ x (* 64 i)) 256))
+  for j from -1 to 0 do
+  (let ((x1 (/ (+ x (* 32 i)) 256))
 (y1 (/ (+ y (* 64 j)) 256)))
 (unless (and (= x0 x1) (= y0 y1))
   (push `(,(- x (* x1 256)) ,(- y (* y1 256)) ,id ,color . ,help)
@@ -581,12 +587,6 @@ Should be at least 7 days according to the server usage 
policies."
  (y (osm--lat-to-y (car coord) osm--zoom)))
 (osm--put-pin 'osm-bookmark x y "#ff8800" (car bm))
 
-(defun osm--inside-tile-p (x y p q)
-  "Return non-nil if position P/Q is inside tile X/Y."
-  (setq x (* x 256) y (* y 256))
-  (and (>= p (- x 64)) (< p (+ x 256 64))
-   (>= q (- y 64)) (< q (+ y 256 64
-
 (autoload 'svg--image-data "svg")
 (defun osm--make-tile (x y)
   "Make tile at X/Y from FILE."
@@ -598,8 +598,8 @@ Should be at least 7 days according to the server usage 
policies."
   (let* ((areas nil)
  (svg-pins
  (mapconcat
-  (pcase-lambda (`(,px ,py ,id ,color . ,help))
-(push `((poly . [,px ,py ,(- px 20) ,(- py 40) ,px ,(- 
py 50) ,(+ px 20) ,(- py 40) ])
+  (pcase-lambda (`(,p ,q ,id ,color . ,help))
+(push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 
50) ,(+ p 20) ,(- q 40) ])
 ,id (help-echo ,(truncate-string-to-width help 
20 0 nil t) pointer hand))
   areas)
 (format "
@@ -609,7 +609,7 @@ Should be at least 7 days according to the server usage 
policies."
 C409.719 210.844 416 186.156 416 160C416 71.625 344.375
 0 256 0z M256 256c-53.016 0-96-43-96-96s42.984-96 96-96
 c53 0 96 43 96 96S309 256 256 256z'/>
-" color px py)) ;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
+" color p q)) ;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
   pins "")))
 (list :type 'svg :base-uri file :map areas
   :data (concat "
 
 (defun osm--get-tile (x y)
   "Get tile at X/Y."
-  (if (cl-loop for (_id px py . _rest) in osm--transient-pins
-   thereis (osm--inside-tile-p x y px py))
+  (if (cl-loop for (_id p q . _rest) in osm--transient-pins
+   thereis (osm--pin-at-p x y p q))
   (osm--make-tile x y)
 (let* ((key `(,osm-server ,osm--zoom ,x . ,y))
(tile (and osm--tiles (gethash key osm--tiles

[elpa] externals/osm 04e2b30c0e 4/4: Bind key to delete selected bookmark pin

[ELPA Syncer]

branch: externals/osm
commit 04e2b30c0ee85ff3f035d892595f497ca36e200f
Author: Daniel Mendler 
Commit: Daniel Mendler 

Bind key to delete selected bookmark pin
---
 README.org |  1 +
 osm.el | 33 +++--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/README.org b/README.org
index df1443aa8b..f655bd2093 100644
--- a/README.org
+++ b/README.org
@@ -81,6 +81,7 @@ Key bindings in =osm-mode= buffer:
 - ~~: =osm-bookmark-set-click= - Store point as bookmark
 - ~~: =osm-bookmark-delete-click= - Click on bookmark at 
point to delete
 - ~~: =osm-drag= - Drag the map with the mouse
+- ~d~, ~DEL~: =osm-bookmark-delete= - Delete selected bookmark
 - ~g~: =osm-goto= - Go to location
 - ~h~: =osm-home= - Go to home location
 - ~s~: =osm-search= - Search for location
diff --git a/osm.el b/osm.el
index 11aa677117..e04bc29cbc 100644
--- a/osm.el
+++ b/osm.el
@@ -139,7 +139,6 @@ Should be at least 7 days according to the server usage 
policies."
 (define-key map "-" #'osm-zoom-out)
 (define-key map " " #'osm-zoom-in)
 (define-key map (kbd "S-SPC") #'osm-zoom-out)
-(define-key map "\d" #'osm-zoom-out)
 (define-key map [mouse-1] #'osm-center-click)
 (define-key map [mouse-2] #'osm-org-link-click)
 (define-key map [mouse-3] #'osm-bookmark-set-click)
@@ -158,6 +157,8 @@ Should be at least 7 days according to the server usage 
policies."
 (define-key map [M-down] #'osm-down-down)
 (define-key map [M-left] #'osm-left-left)
 (define-key map [M-right] #'osm-right-right)
+(define-key map "d" #'osm-bookmark-delete)
+(define-key map "\d" #'osm-bookmark-delete)
 (define-key map "c" #'clone-buffer)
 (define-key map "h" #'osm-home)
 (define-key map "g" #'osm-goto)
@@ -393,7 +394,7 @@ Should be at least 7 days according to the server usage 
policies."
 (when (< osm--zoom (osm--server-property :max-zoom))
   (cl-incf osm--x (- x osm--wx))
   (cl-incf osm--y (- y osm--wy))
-  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center" 
'auto-remove)
+  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center")
   (osm--update
 
 (defun osm-bookmark-set-click (event)
@@ -420,6 +421,7 @@ Should be at least 7 days according to the server usage 
policies."
(d (+ (* (- p x) (- p x)) (* (- q y) (- q y)
   (when (and (>= q y) (< q (+ y 50)) (>= p (- x 20)) (< p (+ x 20)) (< 
d min))
 (setq min d found `(,p ,q . ,(car bm)))
+(message "Selected '%s'" (cddr found))
 (osm--put-transient-pin 'osm-selected-bookmark
 (car found) (cadr found)
 "#FF" (cddr found))
@@ -432,7 +434,7 @@ Should be at least 7 days according to the server usage 
policies."
(osm--x (+ osm--x (- x osm--wx)))
(osm--y (+ osm--y (- y osm--wy
 (call-interactively 'org-store-link)
-(osm--put-transient-pin 'osm-transient osm--x osm--y "#7a9" "Org Link" 
'auto-remove))
+(osm--put-transient-pin 'osm-transient osm--x osm--y "#7a9" "Org Link"))
   (osm--update))
 
 (defun osm-zoom-in (&optional n)
@@ -557,7 +559,7 @@ Should be at least 7 days according to the server usage 
policies."
   "Return non-nil if pin P/Q is inside tile X/Y."
   (setq x (* x 256) y (* y 256))
   (and (>= p (- x 32)) (< p (+ x 256 32))
-   (>= q (- y 64)) (< q (+ y 256 ;; no + 64 here!
+   (>= q y) (< q (+ y 256 64
 
 (defun osm--put-pin (id x y color help)
   "Put pin at X/Y with COLOR, HELP and ID in pins hash table."
@@ -848,21 +850,24 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 osm--zoom (nth 2 at)
 osm--x (osm--lon-to-x (nth 1 at) osm--zoom)
 osm--y (osm--lat-to-y (nth 0 at) osm--zoom))
-  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center" 
'auto-remove))
+  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center"))
 (prog1 (pop-to-buffer (current-buffer))
   (osm--update
 
-(defun osm--put-transient-pin (id x y color help &optional auto-remove)
-  "Set transient pin at X/Y with COLOR, ID and HELP.
-AUTO-REMOVE the pin if non-nil."
+(defun osm--put-transient-pin (id x y color help)
+  "Set transient pin at X/Y with COLOR, ID and HELP."
   (let ((buffer (current-buffer))
 (sym (make-symbol "osm--remove-transient-pin")))
-(when auto-remove
-  (fset sym (lambda ()
-  (with-current-buffer buffer
-(setq osm--transient-pins (assq-delete-all id 
osm--transient-pins))
-(remove-hook 'pre-command-hook sym
-  (add-hook 'pre-command-hook sym))
+(fset sym (lambda ()
+(with-current-buffer buffer
+  (remove-hook 'pre-command-hook sym)
+  (setq osm--transient-pins (assq-delete-all id 
osm--transient-pins))
+  ;; HACK

[elpa] externals/osm ef04087c23 2/4: Implement bookmark selection

[ELPA Syncer]

branch: externals/osm
commit ef04087c230c6801893651e46602c5e25e203d0e
Author: Daniel Mendler 
Commit: Daniel Mendler 

Implement bookmark selection
---
 osm.el | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/osm.el b/osm.el
index 9398da2c05..4584c03d72 100644
--- a/osm.el
+++ b/osm.el
@@ -132,9 +132,9 @@ Should be at least 7 days according to the server usage 
policies."
 (defvar osm-mode-map
   (let ((map (make-sparse-keymap)))
 (define-key map [osm-transient] #'ignore)
-(define-key map [osm-bookmark mouse-1] #'osm-bookmark-delete-click)
-(define-key map [osm-bookmark mouse-2] #'osm-bookmark-delete-click)
-(define-key map [osm-bookmark mouse-3] #'osm-bookmark-delete-click)
+(define-key map [osm-bookmark mouse-1] #'osm-bookmark-select-click)
+(define-key map [osm-bookmark mouse-2] #'osm-bookmark-select-click)
+(define-key map [osm-bookmark mouse-3] #'osm-bookmark-select-click)
 (define-key map "+" #'osm-zoom-in)
 (define-key map "-" #'osm-zoom-out)
 (define-key map " " #'osm-zoom-in)
@@ -393,7 +393,7 @@ Should be at least 7 days according to the server usage 
policies."
 (when (< osm--zoom (osm--server-property :max-zoom))
   (cl-incf osm--x (- x osm--wx))
   (cl-incf osm--y (- y osm--wy))
-  (osm--put-transient-pin 'osm-transient "#ff0088" "Center" 'auto-remove)
+  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center" 
'auto-remove)
   (osm--update
 
 (defun osm-bookmark-set-click (event)
@@ -404,8 +404,8 @@ Should be at least 7 days according to the server usage 
policies."
(osm--y (+ osm--y (- y osm--wy
 (osm-bookmark-set)))
 
-(defun osm-bookmark-delete-click (event)
-  "Delete bookmark at position of click EVENT."
+(defun osm-bookmark-select-click (event)
+  "Select bookmark at position of click EVENT."
   (interactive "@e")
   (pcase-let* ((`(,x . ,y) (posn-x-y (event-start event)))
(x (+ osm--x (- x osm--wx)))
@@ -419,11 +419,11 @@ Should be at least 7 days according to the server usage 
policies."
(q (osm--lat-to-y (car coord) osm--zoom))
(d (+ (* (- p x) (- p x)) (* (- q y) (- q y)
   (when (and (>= q y) (< q (+ y 50)) (>= p (- x 20)) (< p (+ x 20)) (< 
d min))
-(setq min d found (car bm))
-(unless found
-  (error "No bookmark at point"))
-(when (y-or-n-p (format "Delete bookmark '%s'? " found))
-  (osm-bookmark-delete found
+(setq min d found `(,p ,q . ,(car bm)))
+(osm--put-transient-pin 'osm-selected-bookmark
+(car found) (cadr found)
+"#FF" (cddr found))
+(osm--update)))
 
 (defun osm-org-link-click (event)
   "Store link at position of click EVENT."
@@ -432,7 +432,7 @@ Should be at least 7 days according to the server usage 
policies."
(osm--x (+ osm--x (- x osm--wx)))
(osm--y (+ osm--y (- y osm--wy
 (call-interactively 'org-store-link)
-(osm--put-transient-pin 'osm-transient "#7a9" "Org Link" 'auto-remove))
+(osm--put-transient-pin 'osm-transient osm--x osm--y "#7a9" "Org Link" 
'auto-remove))
   (osm--update))
 
 (defun osm-zoom-in (&optional n)
@@ -848,12 +848,12 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 osm--zoom (nth 2 at)
 osm--x (osm--lon-to-x (nth 1 at) osm--zoom)
 osm--y (osm--lat-to-y (nth 0 at) osm--zoom))
-  (osm--put-transient-pin 'osm-transient "#ff0088" "Center" 'auto-remove))
+  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center" 
'auto-remove))
 (prog1 (pop-to-buffer (current-buffer))
   (osm--update
 
-(defun osm--put-transient-pin (id color help &optional auto-remove)
-  "Set transient pin with COLOR, ID and HELP.
+(defun osm--put-transient-pin (id x y color help &optional auto-remove)
+  "Set transient pin at X/Y with COLOR, ID and HELP.
 AUTO-REMOVE the pin if non-nil."
   (let ((buffer (current-buffer))
 (sym (make-symbol "osm--remove-transient-pin")))
@@ -864,7 +864,7 @@ AUTO-REMOVE the pin if non-nil."
 (remove-hook 'pre-command-hook sym
   (add-hook 'pre-command-hook sym))
 (setf (alist-get id osm--transient-pins)
-  (list osm--x osm--y color help
+  (list x y color help
 
 ;;;###autoload
 (defun osm-goto (lat lon zoom)
@@ -1003,7 +1003,7 @@ MSG is a message prefix string."
#'osm-zoom-out #'osm-zoom-in #'osm-bookmark-set))
   (put sym 'command-modes '(osm-mode)))
 (dolist (sym (list #'osm-drag #'osm-center-click #'osm-org-link-click
-#'osm-bookmark-set-click #'osm-bookmark-delete-click))
+#'osm-bookmark-set-click #'osm-bookmark-select-click))
   (put sym 'completion-predicate #'ignore))
 
 (provide 'osm)

[elpa] externals/osm updated (dd9fff0916 -> 04e2b30c0e)

[ELPA Syncer]

elpasync pushed a change to branch externals/osm.

  from  dd9fff0916 Improve server configuration
   new  a56cc3e248 Support multiple transient pins
   new  ef04087c23 Implement bookmark selection
   new  bcad977316 Minor optimization
   new  04e2b30c0e Bind key to delete selected bookmark pin


Summary of changes:
 README.org |  1 +
 osm.el | 99 +-
 2 files changed, 53 insertions(+), 47 deletions(-)

[elpa] externals/osm a56cc3e248 1/4: Support multiple transient pins

[ELPA Syncer]

branch: externals/osm
commit a56cc3e248e9c3801595dda3ca049a4371a7b586
Author: Daniel Mendler 
Commit: Daniel Mendler 

Support multiple transient pins
---
 osm.el | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osm.el b/osm.el
index 6f88275387..9398da2c05 100644
--- a/osm.el
+++ b/osm.el
@@ -230,8 +230,8 @@ Should be at least 7 days according to the server usage 
policies."
 (defvar-local osm--pins nil
   "Pin hash table.")
 
-(defvar-local osm--transient-pin nil
-  "Transient pin.")
+(defvar-local osm--transient-pins nil
+  "Transient pins.")
 
 (defun osm--boundingbox-to-zoom (lat1 lat2 lon1 lon2)
   "Compute zoom level from boundingbox LAT1 to LAT2 and LON1 to LON2."
@@ -393,7 +393,7 @@ Should be at least 7 days according to the server usage 
policies."
 (when (< osm--zoom (osm--server-property :max-zoom))
   (cl-incf osm--x (- x osm--wx))
   (cl-incf osm--y (- y osm--wy))
-  (osm--put-transient-pin 'osm-transient "#ff0088" "Center")
+  (osm--put-transient-pin 'osm-transient "#ff0088" "Center" 'auto-remove)
   (osm--update
 
 (defun osm-bookmark-set-click (event)
@@ -432,7 +432,7 @@ Should be at least 7 days according to the server usage 
policies."
(osm--x (+ osm--x (- x osm--wx)))
(osm--y (+ osm--y (- y osm--wy
 (call-interactively 'org-store-link)
-(osm--put-transient-pin 'osm-transient "#7a9" "Org Link"))
+(osm--put-transient-pin 'osm-transient "#7a9" "Org Link" 'auto-remove))
   (osm--update))
 
 (defun osm-zoom-in (&optional n)
@@ -553,7 +553,7 @@ Should be at least 7 days according to the server usage 
policies."
   bookmark-make-record-function #'osm--make-bookmark)
   (add-hook 'window-size-change-functions #'osm--resize nil 'local))
 
-(defun osm--put-pin (x y id color help)
+(defun osm--put-pin (id x y color help)
   "Put pin at X/Y with COLOR, HELP and ID in pins hash table."
   (let ((x0 (/ x 256)) (y0 (/ y 256)))
 (push `(,(- x (* x0 256)) ,(- y (* y0 256)) ,id ,color . ,help)
@@ -571,15 +571,15 @@ Should be at least 7 days according to the server usage 
policies."
 (defun osm--update-pins ()
   "Compute pin positions."
   (setq osm--pins (make-hash-table :test #'equal))
-  (when osm--transient-pin
-(apply #'osm--put-pin osm--transient-pin))
+  (dolist (pin osm--transient-pins)
+(apply #'osm--put-pin pin))
   (bookmark-maybe-load-default-file)
   (dolist (bm bookmark-alist)
 (when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
   (let* ((coord (bookmark-prop-get bm 'coordinates))
  (x (osm--lon-to-x (cadr coord) osm--zoom))
  (y (osm--lat-to-y (car coord) osm--zoom)))
-(osm--put-pin x y 'osm-bookmark "#ff8800" (car bm))
+(osm--put-pin 'osm-bookmark x y "#ff8800" (car bm))
 
 (defun osm--inside-tile-p (x y p q)
   "Return non-nil if position P/Q is inside tile X/Y."
@@ -632,10 +632,8 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 
 (defun osm--get-tile (x y)
   "Get tile at X/Y."
-  (if (and osm--transient-pin
-   (osm--inside-tile-p x y
-   (car osm--transient-pin)
-   (cadr osm--transient-pin)))
+  (if (cl-loop for (_id px py . _rest) in osm--transient-pins
+   thereis (osm--inside-tile-p x y px py))
   (osm--make-tile x y)
 (let* ((key `(,osm-server ,osm--zoom ,x . ,y))
(tile (and osm--tiles (gethash key osm--tiles
@@ -850,21 +848,23 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 osm--zoom (nth 2 at)
 osm--x (osm--lon-to-x (nth 1 at) osm--zoom)
 osm--y (osm--lat-to-y (nth 0 at) osm--zoom))
-  (osm--put-transient-pin 'osm-transient "#ff0088" "Center"))
+  (osm--put-transient-pin 'osm-transient "#ff0088" "Center" 'auto-remove))
 (prog1 (pop-to-buffer (current-buffer))
   (osm--update
 
-(defun osm--put-transient-pin (id color help)
-  "Set transient pin with COLOR, ID and HELP."
-  (unless osm--transient-pin
-(let ((buffer (current-buffer))
-  (sym (make-symbol "osm--remove-transient-pin")))
+(defun osm--put-transient-pin (id color help &optional auto-remove)
+  "Set transient pin with COLOR, ID and HELP.
+AUTO-REMOVE the pin if non-nil."
+  (let ((buffer (current-buffer))
+(sym (make-symbol "osm--remove-transient-pin")))
+(when auto-remove
   (fset sym (lambda ()
   (with-current-buffer buffer
-(setq osm--transient-pin nil)
+(setq osm--transient-pins (assq-delete-all id 
osm--transient-pins))
 (remove-hook 'pre-command-hook sym
-  (add-hook 'pre-command-hook sym)
-  (setq osm--transient-pin (list osm--x osm--y id color help)
+  (add-hook 'pre-command-hook sym))
+(setf (alist-get id osm--transient-pins)
+   

[elpa] externals/osm updated (04e2b30c0e -> 171f1616b4)

[ELPA Syncer]

elpasync pushed a change to branch externals/osm.

  from  04e2b30c0e Bind key to delete selected bookmark pin
   new  c3215cf89f Configurable pin colors
   new  954a97495d Version 0.3
   new  171f1616b4 Prettier pins


Summary of changes:
 osm.el | 66 +++---
 1 file changed, 39 insertions(+), 27 deletions(-)

[elpa] externals/osm 171f1616b4 3/3: Prettier pins

[ELPA Syncer]

branch: externals/osm
commit 171f1616b4f9182c99a8260a7182ead712d322f8
Author: Daniel Mendler 
Commit: Daniel Mendler 

Prettier pins
---
 osm.el | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osm.el b/osm.el
index 1e8f502228..3528660fff 100644
--- a/osm.el
+++ b/osm.el
@@ -95,12 +95,12 @@
   :type '(alist :key-type symbol :value-type plist))
 
 (defcustom osm-pin-colors
-  '((selected-bookmark . "#e20")
-(bookmark . "#f80")
-(center . "#f08")
-(org-link . "#7a9"))
+  '((selected-bookmark "#e20" "#600")
+(bookmark "#f80" "#820")
+(center "#08f" "#028")
+(org-link "#7a9" "#254"))
   "Colors of pins."
-  :type '(alist :key-type symbol :value-type string))
+  :type '(alist :key-type symbol :value-type (list string string)))
 
 (defcustom osm-home
   (let ((lat (bound-and-true-p calendar-latitude))
@@ -608,20 +608,22 @@ Should be at least 7 days according to the server usage 
policies."
 ,@(if-let (pins (gethash (cons x y) osm--pins))
   (let* ((areas nil)
  (svg-pins
- (mapconcat
-  (pcase-lambda (`(,p ,q ,id . ,help))
+  (mapconcat
+   (lambda (pin)
+ (pcase-let* ((`(,p ,q ,id . ,help) pin)
+  (`(,_ ,bg ,fg) (assq id osm-pin-colors)))
 (push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 
50) ,(+ p 20) ,(- q 40) ])
 ,id (help-echo ,(truncate-string-to-width help 
20 0 nil t) pointer hand))
   areas)
 ;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
 (format "
-
+
 
-" (alist-get id osm-pin-colors) p q))
+" bg fg p q)))
   pins "")))
 (list :type 'svg :base-uri file :map areas
   :data (concat "

[elpa] externals/vertico e82b7ff371: Version 0.21

[ELPA Syncer]

branch: externals/vertico
commit e82b7ff371a348d9e5a1ac7bf4b652f0a2d38198
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.21
---
 extensions/vertico-buffer.el  | 2 +-
 extensions/vertico-directory.el   | 2 +-
 extensions/vertico-flat.el| 2 +-
 extensions/vertico-grid.el| 2 +-
 extensions/vertico-indexed.el | 2 +-
 extensions/vertico-mouse.el   | 2 +-
 extensions/vertico-multiform.el   | 2 +-
 extensions/vertico-quick.el   | 2 +-
 extensions/vertico-repeat.el  | 2 +-
 extensions/vertico-reverse.el | 2 +-
 extensions/vertico-unobtrusive.el | 2 +-
 vertico.el| 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index 575343e1b1..83103413b1 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el
index c6f5d219f1..fd08d1dbf5 100644
--- a/extensions/vertico-directory.el
+++ b/extensions/vertico-directory.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 240d8d04e8..b5c682645f 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-grid.el b/extensions/vertico-grid.el
index d135b90a91..cdf1e3d117 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-indexed.el b/extensions/vertico-indexed.el
index 891374da65..341190ef28 100644
--- a/extensions/vertico-indexed.el
+++ b/extensions/vertico-indexed.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-mouse.el b/extensions/vertico-mouse.el
index 2e0fdd59e7..35c771fb1c 100644
--- a/extensions/vertico-mouse.el
+++ b/extensions/vertico-mouse.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index 985e472e3d..20b9ffbc47 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-quick.el b/extensions/vertico-quick.el
index 30a90e158a..b7ec05a685 100644
--- a/extensions/vertico-quick.el
+++ b/extensions/vertico-quick.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-repeat.el b/extensions/vertico-repeat.el
index 511f657be1..4840f108da 100644
--- a/extensions/vertico-repeat.el
+++ b/extensions/vertico-repeat.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
 ;; Version: 0.1
-;; Package-Requires: ((emacs "27.1") (vertico "0.20"))
+;; Package-Requires: ((emacs "27.1") (vertico "0.21"))
 ;; Homepage: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-reverse.el b/extensions/vertico-reverse.el
index 9383c3528e..1978106778 100644
--- a/extensions/vertico-reverse.el
+++ b/extension

[elpa] externals/consult 800824601b 2/2: Version 0.16

[ELPA Syncer]

branch: externals/consult
commit 800824601b610016066991d6e2dde198d4b0ad8f
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.16
---
 CHANGELOG.org | 2 +-
 consult.el| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 471204de67..ebf184fda1 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -2,7 +2,7 @@
 #+author: Daniel Mendler
 #+language: en
 
-* Development
+* Version 0.16 (2022-03-08)
 
 - Bug fixes
 - Deprecate =consult-project-root-function= in favor of 
=consult-project-function=.
diff --git a/consult.el b/consult.el
index 465ab07779..7525fa4668 100644
--- a/consult.el
+++ b/consult.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler and Consult contributors
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2020
-;; Version: 0.15
+;; Version: 0.16
 ;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/minad/consult
 

[elpa] externals/corfu e2cc92b029: Version 0.20

[ELPA Syncer]

branch: externals/corfu
commit e2cc92b029bd9334f88d382def7066c35c31b3a9
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.20
---
 corfu.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corfu.el b/corfu.el
index 58e20f4e14..51065ae0f1 100644
--- a/corfu.el
+++ b/corfu.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler 
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
-;; Version: 0.19
+;; Version: 0.20
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://github.com/minad/corfu
 

[elpa] externals/consult updated (9b4f33ba7a -> 800824601b)

[ELPA Syncer]

elpasync pushed a change to branch externals/consult.

  from  9b4f33ba7a README: Add link to consult-flyspell
   new  123ed072e3 Update copyright
   new  800824601b Version 0.16


Summary of changes:
 CHANGELOG.org| 2 +-
 consult-compile.el   | 2 +-
 consult-flymake.el   | 2 +-
 consult-icomplete.el | 2 +-
 consult-imenu.el | 2 +-
 consult-org.el   | 2 +-
 consult-register.el  | 2 +-
 consult-selectrum.el | 6 +++---
 consult-vertico.el   | 2 +-
 consult-xref.el  | 2 +-
 consult.el   | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

[elpa] externals/consult 123ed072e3 1/2: Update copyright

[ELPA Syncer]

branch: externals/consult
commit 123ed072e32ad7015f1191f242fdf529907167c3
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update copyright
---
 consult-compile.el   | 2 +-
 consult-flymake.el   | 2 +-
 consult-icomplete.el | 2 +-
 consult-imenu.el | 2 +-
 consult-org.el   | 2 +-
 consult-register.el  | 2 +-
 consult-selectrum.el | 6 +++---
 consult-vertico.el   | 2 +-
 consult-xref.el  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/consult-compile.el b/consult-compile.el
index a80cd6c4a3..4beff9aa19 100644
--- a/consult-compile.el
+++ b/consult-compile.el
@@ -1,6 +1,6 @@
 ;;; consult-compile.el --- Provides the command `consult-compile-error' -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-flymake.el b/consult-flymake.el
index 1e00a14b40..ea0e68633f 100644
--- a/consult-flymake.el
+++ b/consult-flymake.el
@@ -1,6 +1,6 @@
 ;;; consult-flymake.el --- Provides the command `consult-flymake' -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-icomplete.el b/consult-icomplete.el
index 8186ff7b73..122ce7f618 100644
--- a/consult-icomplete.el
+++ b/consult-icomplete.el
@@ -1,6 +1,6 @@
 ;;; consult-icomplete.el --- Icomplete integration for Consult -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-imenu.el b/consult-imenu.el
index c2d83a05c9..245c00cb2c 100644
--- a/consult-imenu.el
+++ b/consult-imenu.el
@@ -1,6 +1,6 @@
 ;;; consult-imenu.el --- Consult commands for imenu -*- lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-org.el b/consult-org.el
index cb829b09e2..6e01b22460 100644
--- a/consult-org.el
+++ b/consult-org.el
@@ -1,6 +1,6 @@
 ;;; consult-org.el --- Consult commands for org-mode -*- lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-register.el b/consult-register.el
index 99b0a8ecda..31bc448bea 100644
--- a/consult-register.el
+++ b/consult-register.el
@@ -1,6 +1,6 @@
 ;;; consult-register.el --- Consult commands for registers -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-selectrum.el b/consult-selectrum.el
index aa41ab6f68..c5f88c57bf 100644
--- a/consult-selectrum.el
+++ b/consult-selectrum.el
@@ -1,6 +1,6 @@
 ;;; consult-selectrum.el --- Selectrum integration for Consult -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -81,9 +81,9 @@ SPLIT is the splitter function."
   (if (not selectrum-is-active)
   (funcall orig split)
 (setq-local selectrum-refine-candidates-function
-   (consult-selectrum--split-wrap 
selectrum-refine-candidates-function split))
+(consult-selectrum--split-wrap 
selectrum-refine-candidates-function split))
 (setq-local selectrum-highlight-candidates-function
-   (consult-selectrum--split-wrap 
selectrum-highlight-candidates-function split
+(consult-selectrum--split-wrap 
selectrum-highlight-candidates-function split
 
 (defun consult-selectrum--crm-adv (&rest args)
   "Setup crm for Selectrum given ARGS."
diff --git a/consult-vertico.el b/consult-vertico.el
index 5e20143310..87d5e75508 100644
--- a/consult-vertico.el
+++ b/consult-vertico.el
@@ -1,6 +1,6 @@
 ;;; consult-vertico.el --- Vertico integration for Consult -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/consult-xref.el b/consult-xref.el
index f99eb41c2b..bee3f02d5b 100644
--- a/consult-xref.el
+++ b/consult-xref.el
@@ -1,6 +1,6 @@
 ;;; consult-xref.el --- Xref integration for Consult -*- lexical-binding: t -*-
 
-;; Copyright (C) 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2021, 2022  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 

[elpa] externals/marginalia bd98c02720: Version 0.13

[ELPA Syncer]

branch: externals/marginalia
commit bd98c02720bc59a5c185c293f60595d06dfd7637
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.13
---
 marginalia.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marginalia.el b/marginalia.el
index 419194b389..eb259b14d5 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -5,7 +5,7 @@
 ;; Author: Omar Antolín Camarena , Daniel Mendler 

 ;; Maintainer: Omar Antolín Camarena , Daniel Mendler 

 ;; Created: 2020
-;; Version: 0.12
+;; Version: 0.13
 ;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/minad/marginalia
 

[elpa] externals/osm c3215cf89f 1/3: Configurable pin colors

[ELPA Syncer]

branch: externals/osm
commit c3215cf89fb0f9f6af026b83e7f54b703f8d77fe
Author: Daniel Mendler 
Commit: Daniel Mendler 

Configurable pin colors
---
 osm.el | 58 ++
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/osm.el b/osm.el
index e04bc29cbc..51d967c39b 100644
--- a/osm.el
+++ b/osm.el
@@ -94,6 +94,14 @@
   "List of tile servers."
   :type '(alist :key-type symbol :value-type plist))
 
+(defcustom osm-pin-colors
+  '((selected-bookmark . "#e20")
+(bookmark . "#f80")
+(center . "#f08")
+(org-link . "#7a9"))
+  "Colors of pins."
+  :type '(alist :key-type symbol :value-type string))
+
 (defcustom osm-home
   (let ((lat (bound-and-true-p calendar-latitude))
 (lon (bound-and-true-p calendar-longitude)))
@@ -131,10 +139,12 @@ Should be at least 7 days according to the server usage 
policies."
 
 (defvar osm-mode-map
   (let ((map (make-sparse-keymap)))
-(define-key map [osm-transient] #'ignore)
-(define-key map [osm-bookmark mouse-1] #'osm-bookmark-select-click)
-(define-key map [osm-bookmark mouse-2] #'osm-bookmark-select-click)
-(define-key map [osm-bookmark mouse-3] #'osm-bookmark-select-click)
+(define-key map [org-link] #'ignore)
+(define-key map [center] #'ignore)
+(define-key map [selected-bookmark] #'ignore)
+(define-key map [bookmark mouse-1] #'osm-bookmark-select-click)
+(define-key map [bookmark mouse-2] #'osm-bookmark-select-click)
+(define-key map [bookmark mouse-3] #'osm-bookmark-select-click)
 (define-key map "+" #'osm-zoom-in)
 (define-key map "-" #'osm-zoom-out)
 (define-key map " " #'osm-zoom-in)
@@ -394,7 +404,7 @@ Should be at least 7 days according to the server usage 
policies."
 (when (< osm--zoom (osm--server-property :max-zoom))
   (cl-incf osm--x (- x osm--wx))
   (cl-incf osm--y (- y osm--wy))
-  (osm--put-transient-pin 'osm-transient osm--x osm--y "#ff0088" "Center")
+  (osm--put-transient-pin 'center osm--x osm--y "Center")
   (osm--update
 
 (defun osm-bookmark-set-click (event)
@@ -420,12 +430,11 @@ Should be at least 7 days according to the server usage 
policies."
(q (osm--lat-to-y (car coord) osm--zoom))
(d (+ (* (- p x) (- p x)) (* (- q y) (- q y)
   (when (and (>= q y) (< q (+ y 50)) (>= p (- x 20)) (< p (+ x 20)) (< 
d min))
-(setq min d found `(,p ,q . ,(car bm)))
-(message "Selected '%s'" (cddr found))
-(osm--put-transient-pin 'osm-selected-bookmark
-(car found) (cadr found)
-"#FF" (cddr found))
-(osm--update)))
+(setq min d found (list p q (car bm)))
+(when found
+  (message "Selected '%s'" (cddr found))
+  (apply #'osm--put-transient-pin 'selected-bookmark found)
+  (osm--update
 
 (defun osm-org-link-click (event)
   "Store link at position of click EVENT."
@@ -434,7 +443,7 @@ Should be at least 7 days according to the server usage 
policies."
(osm--x (+ osm--x (- x osm--wx)))
(osm--y (+ osm--y (- y osm--wy
 (call-interactively 'org-store-link)
-(osm--put-transient-pin 'osm-transient osm--x osm--y "#7a9" "Org Link"))
+(osm--put-transient-pin 'org-link osm--x osm--y "Org Link"))
   (osm--update))
 
 (defun osm-zoom-in (&optional n)
@@ -561,10 +570,10 @@ Should be at least 7 days according to the server usage 
policies."
   (and (>= p (- x 32)) (< p (+ x 256 32))
(>= q y) (< q (+ y 256 64
 
-(defun osm--put-pin (id x y color help)
-  "Put pin at X/Y with COLOR, HELP and ID in pins hash table."
+(defun osm--put-pin (id x y help)
+  "Put pin at X/Y with HELP and ID in pins hash table."
   (let ((x0 (/ x 256)) (y0 (/ y 256)))
-(push `(,(- x (* x0 256)) ,(- y (* y0 256)) ,id ,color . ,help)
+(push `(,(- x (* x0 256)) ,(- y (* y0 256)) ,id . ,help)
   (gethash (cons x0 y0) osm--pins))
 (cl-loop
  for i from -1 to 1 do
@@ -573,7 +582,7 @@ Should be at least 7 days according to the server usage 
policies."
   (let ((x1 (/ (+ x (* 32 i)) 256))
 (y1 (/ (+ y (* 64 j)) 256)))
 (unless (and (= x0 x1) (= y0 y1))
-  (push `(,(- x (* x1 256)) ,(- y (* y1 256)) ,id ,color . ,help)
+  (push `(,(- x (* x1 256)) ,(- y (* y1 256)) ,id . ,help)
 (gethash (cons x1 y1) osm--pins
 
 (defun osm--update-pins ()
@@ -587,7 +596,7 @@ Should be at least 7 days according to the server usage 
policies."
   (let* ((coord (bookmark-prop-get bm 'coordinates))
  (x (osm--lon-to-x (cadr coord) osm--zoom))
  (y (osm--lat-to-y (car coord) osm--zoom)))
-(osm--put-pin 'osm-bookmark x y "#ff8800" (car bm))
+(osm--put-pin 'bookmark x y (car bm))
 
 (autoload 'svg--image-data "svg")
 (defun osm--make-tile (x y)
@@ -600,10 +609,11 @@ Should be at least 7 days according to the ser

[elpa] externals/tempel ee964c24b6: Version 0.3

[ELPA Syncer]

branch: externals/tempel
commit ee964c24b69579fcd5ec3c7d3d1d84d1ca3d90e4
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.3
---
 tempel.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tempel.el b/tempel.el
index ada8a190ce..8624ae8c03 100644
--- a/tempel.el
+++ b/tempel.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler 
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2022
-;; Version: 0.2
+;; Version: 0.3
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://github.com/minad/tempel
 

[elpa] externals/cape 51b9bf1276: Version 0.7

[ELPA Syncer]

branch: externals/cape
commit 51b9bf1276445faebfbad636d9b6a39dc57b22bc
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.7
---
 cape.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cape.el b/cape.el
index 7668d69159..169334f6a6 100644
--- a/cape.el
+++ b/cape.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler 
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2021
-;; Version: 0.6
+;; Version: 0.7
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://github.com/minad/cape
 

[elpa] externals/osm 954a97495d 2/3: Version 0.3

[ELPA Syncer]

branch: externals/osm
commit 954a97495d50ae27f21597a7ca29f14ac1f8e7c6
Author: Daniel Mendler 
Commit: Daniel Mendler 

Version 0.3
---
 osm.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osm.el b/osm.el
index 51d967c39b..1e8f502228 100644
--- a/osm.el
+++ b/osm.el
@@ -5,7 +5,7 @@
 ;; Author: Daniel Mendler 
 ;; Maintainer: Daniel Mendler 
 ;; Created: 2022
-;; Version: 0.2
+;; Version: 0.3
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://github.com/minad/osm
 

[elpa] externals/osm 433bad7b02: Simplify again, only a single transient pin

[ELPA Syncer]

branch: externals/osm
commit 433bad7b022a5a4c050eba5b29252a8fd2d6e4af
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify again, only a single transient pin
---
 osm.el | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osm.el b/osm.el
index 3528660fff..49d645dd22 100644
--- a/osm.el
+++ b/osm.el
@@ -241,8 +241,8 @@ Should be at least 7 days according to the server usage 
policies."
 (defvar-local osm--pins nil
   "Pin hash table.")
 
-(defvar-local osm--transient-pins nil
-  "Transient pins.")
+(defvar-local osm--transient-pin nil
+  "Transient pin.")
 
 (defun osm--boundingbox-to-zoom (lat1 lat2 lon1 lon2)
   "Compute zoom level from boundingbox LAT1 to LAT2 and LON1 to LON2."
@@ -588,8 +588,8 @@ Should be at least 7 days according to the server usage 
policies."
 (defun osm--update-pins ()
   "Compute pin positions."
   (setq osm--pins (make-hash-table :test #'equal))
-  (dolist (pin osm--transient-pins)
-(apply #'osm--put-pin pin))
+  (when osm--transient-pin
+(apply #'osm--put-pin osm--transient-pin))
   (bookmark-maybe-load-default-file)
   (dolist (bm bookmark-alist)
 (when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
@@ -646,8 +646,8 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 
 (defun osm--get-tile (x y)
   "Get tile at X/Y."
-  (if (cl-loop for (_id p q . _rest) in osm--transient-pins
-   thereis (osm--pin-at-p x y p q))
+  (if (pcase osm--transient-pin
+   (`(,_id ,p ,q . ,_) (osm--pin-at-p x y p q)))
   (osm--make-tile x y)
 (let* ((key `(,osm-server ,osm--zoom ,x . ,y))
(tile (and osm--tiles (gethash key osm--tiles
@@ -873,15 +873,14 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 (fset sym (lambda ()
 (with-current-buffer buffer
   (remove-hook 'pre-command-hook sym)
-  (setq osm--transient-pins (assq-delete-all id 
osm--transient-pins))
+  (setq osm--transient-pin nil)
   ;; HACK: handle bookmark deletion
   (when (and (eq this-command #'osm-bookmark-delete)
  (eq id 'selected-bookmark))
 (osm-bookmark-delete help)
 (setq this-command #'ignore)
 (add-hook 'pre-command-hook sym)
-(setf (alist-get id osm--transient-pins)
-  (list x y help
+(setq osm--transient-pin (list id x y help
 
 ;;;###autoload
 (defun osm-goto (lat lon zoom)

[elpa] externals/osm updated (433bad7b02 -> 42052c4be1)

[ELPA Syncer]

elpasync pushed a change to branch externals/osm.

  from  433bad7b02 Simplify again, only a single transient pin
   new  93d5988599 Improve bookmark and org link storing
   new  42052c4be1 Use selected bookmark color for new bookmarks


Summary of changes:
 osm.el | 99 +-
 1 file changed, 56 insertions(+), 43 deletions(-)

[elpa] externals/osm 93d5988599 1/2: Improve bookmark and org link storing

[ELPA Syncer]

branch: externals/osm
commit 93d598859987bff8b9469bc95e28c8290e007272
Author: Daniel Mendler 
Commit: Daniel Mendler 

Improve bookmark and org link storing
---
 osm.el | 99 +-
 1 file changed, 56 insertions(+), 43 deletions(-)

diff --git a/osm.el b/osm.el
index 49d645dd22..b929617a97 100644
--- a/osm.el
+++ b/osm.el
@@ -410,11 +410,23 @@ Should be at least 7 days according to the server usage 
policies."
 (defun osm-bookmark-set-click (event)
   "Create bookmark at position of click EVENT."
   (interactive "@e")
-  (pcase-let* ((`(,x . ,y) (posn-x-y (event-start event)))
-   (osm--x (+ osm--x (- x osm--wx)))
-   (osm--y (+ osm--y (- y osm--wy
+  (pcase-let ((`(,x . ,y) (posn-x-y (event-start event
+(osm--put-transient-pin 'bookmark
+(+ osm--x (- x osm--wx))
+(+ osm--y (- y osm--wy))
+"New bookmark")
 (osm-bookmark-set)))
 
+(defun osm-org-link-click (event)
+  "Store link at position of click EVENT."
+  (interactive "@e")
+  (pcase-let ((`(,x . ,y) (posn-x-y (event-start event
+(osm--put-transient-pin 'org-link
+(+ osm--x (- x osm--wx))
+(+ osm--y (- y osm--wy))
+"New Org Link")
+(call-interactively 'org-store-link)))
+
 (defun osm-bookmark-select-click (event)
   "Select bookmark at position of click EVENT."
   (interactive "@e")
@@ -436,16 +448,6 @@ Should be at least 7 days according to the server usage 
policies."
   (apply #'osm--put-transient-pin 'selected-bookmark found)
   (osm--update
 
-(defun osm-org-link-click (event)
-  "Store link at position of click EVENT."
-  (interactive "@e")
-  (pcase-let* ((`(,x . ,y) (posn-x-y (event-start event)))
-   (osm--x (+ osm--x (- x osm--wx)))
-   (osm--y (+ osm--y (- y osm--wy
-(call-interactively 'org-store-link)
-(osm--put-transient-pin 'org-link osm--x osm--y "Org Link"))
-  (osm--update))
-
 (defun osm-zoom-in (&optional n)
   "Zoom N times into the map."
   (interactive "p")
@@ -799,20 +801,20 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (dotimes (_ (- (hash-table-count osm--tiles) osm-max-tiles))
 (remhash (cdr (pop items)) osm--tiles)
 
-(defun osm--make-bookmark ()
-  "Make osm bookmark record."
+(defun osm--make-bookmark (&optional name lat lon)
+  "Make osm bookmark record with NAME at LAT/LON."
   (setq bookmark-current-bookmark nil) ;; Reset bookmark to use new name
-  `(,(osm--bookmark-name)
-(coordinates ,(osm--lat) ,(osm--lon) ,osm--zoom)
+  `(,(or name (osm--bookmark-name))
+(coordinates ,(or lat (osm--lat)) ,(or lon (osm--lon)) ,osm--zoom)
 (server . ,osm-server)
 (handler . ,#'osm-bookmark-jump)))
 
 (defun osm--org-link-data ()
   "Return Org link data."
-  (list (osm--lat) (osm--lon) osm--zoom
-(and (not (eq osm-server (default-value 'osm-server))) osm-server)
-(let ((name (string-remove-prefix
- "osm: " (osm--bookmark-name (osm--location-name "Org 
link")
+  (pcase-let ((`(,lat ,lon ,name) (osm--location-data 'org-link "Org link")))
+(setq name (string-remove-prefix "osm: " (osm--bookmark-name name)))
+(list lat lon osm--zoom
+  (and (not (eq osm-server (default-value 'osm-server))) osm-server)
   (if (eq osm-server (default-value 'osm-server))
   (string-remove-suffix (concat " " (osm--server-property :name)) 
name)
 name
@@ -928,28 +930,39 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (interactive)
   (unless (eq major-mode #'osm-mode)
 (error "Not an osm-mode buffer"))
-  (let* ((def (osm--bookmark-name (osm--location-name "Bookmark")))
- (name (read-from-minibuffer "Bookmark name: " def nil nil nil def)))
-(bookmark-set name)
-(message "Stored bookmark: %s" name)
-(run-at-time 0 nil #'osm--revert)))
-
-(defun osm--location-name (msg)
-  "Fetch location name of current position.
-MSG is a message prefix string."
-  (message "%s: Fetching name of %.2f %.2f..." msg (osm--lat) (osm--lon))
-  (ignore-errors
-(alist-get
- 'display_name
- (json-parse-string
-  (shell-command-to-string
-   (concat
-"curl -f -s "
-(shell-quote-argument
- (format 
"https://nominatim.openstreetmap.org/reverse?format=json&zoom=%s&lon=%s&lat=%s";
- (min 18 (max 3 osm--zoom)) (osm--lon) (osm--lat)
-  :array-type 'list
-  :object-type 'alist
+  (unwind-protect
+  (pcase-let* ((`(,lat ,lon ,desc) (osm--location-data 'bookmark 
"Bookmark"))
+   (def (osm--bookmark-name desc))
+   (name (read-from-minibuffer "Bookmark name: " def nil nil 
nil def))
+   (bookmark-make-record-function
+  

[elpa] externals/osm 42052c4be1 2/2: Use selected bookmark color for new bookmarks

[ELPA Syncer]

branch: externals/osm
commit 42052c4be1554a0145a364a59c69a6637f8cf0fe
Author: Daniel Mendler 
Commit: Daniel Mendler 

Use selected bookmark color for new bookmarks
---
 osm.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osm.el b/osm.el
index b929617a97..a1209b8533 100644
--- a/osm.el
+++ b/osm.el
@@ -411,7 +411,7 @@ Should be at least 7 days according to the server usage 
policies."
   "Create bookmark at position of click EVENT."
   (interactive "@e")
   (pcase-let ((`(,x . ,y) (posn-x-y (event-start event
-(osm--put-transient-pin 'bookmark
+(osm--put-transient-pin 'selected-bookmark
 (+ osm--x (- x osm--wx))
 (+ osm--y (- y osm--wy))
 "New bookmark")
@@ -931,7 +931,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (unless (eq major-mode #'osm-mode)
 (error "Not an osm-mode buffer"))
   (unwind-protect
-  (pcase-let* ((`(,lat ,lon ,desc) (osm--location-data 'bookmark 
"Bookmark"))
+  (pcase-let* ((`(,lat ,lon ,desc) (osm--location-data 'selected-bookmark 
"Bookmark"))
(def (osm--bookmark-name desc))
(name (read-from-minibuffer "Bookmark name: " def nil nil 
nil def))
(bookmark-make-record-function

[elpa] externals/osm 87b4616642: osm-search: Fix completing-read (Fix #1)

[ELPA Syncer]

branch: externals/osm
commit 87b46166427b007bc321f8ca407760c0859ab861
Author: Daniel Mendler 
Commit: Daniel Mendler 

osm-search: Fix completing-read (Fix #1)
---
 osm.el | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osm.el b/osm.el
index a1209b8533..9b92b1a20f 100644
--- a/osm.el
+++ b/osm.el
@@ -970,7 +970,8 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (interactive)
   ;; TODO add search bounded to current viewbox, bounded=1, viewbox=x1,y1,x2,y2
   (let* ((search (completing-read
-  "Location: " osm--search-history
+  "Location: "
+  (osm--sorted-table osm--search-history)
   nil nil nil 'osm--search-history))
  (json (json-parse-string
 (shell-command-to-string
@@ -993,12 +994,21 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
  (selected (or (cdr (assoc
  (completing-read
   (format "Matches for '%s': " search)
-  results nil t nil t)
+  (osm--sorted-table results)
+  nil t)
  results))
(error "No selection"
 (osm-goto (car selected) (cadr selected)
   (apply #'osm--boundingbox-to-zoom (cddr selected)
 
+(defun osm--sorted-table (coll)
+  "Sorted completion table from COLL."
+  (lambda (str pred action)
+(if (eq action 'metadata)
+'(metadata (display-sort-function . identity)
+   (cycle-sort-function . identity))
+  (complete-with-action action coll str pred
+
 ;;;###autoload
 (defun osm-server (server)
   "Select tile SERVER."

[elpa] externals/osm updated (87b4616642 -> b05a2514d2)

[ELPA Syncer]

elpasync pushed a change to branch externals/osm.

  from  87b4616642 osm-search: Fix completing-read (Fix #1)
   new  c648edc1b2 Add osm-bookmark-rename
   new  037d0213ac Improve transient pin handling
   new  fcd5d289d0 Always display home pin
   new  13db645b7c Ignore click
   new  2a3edeb745 Do not delete transient pin on ignored commands
   new  b05a2514d2 Generated osm-prefixed key events


Summary of changes:
 README.org |  5 ++--
 osm.el | 91 +-
 2 files changed, 64 insertions(+), 32 deletions(-)

[elpa] externals/osm 2a3edeb745 5/6: Do not delete transient pin on ignored commands

[ELPA Syncer]

branch: externals/osm
commit 2a3edeb745e869668a1c9f5449c19f62a7c304ed
Author: Daniel Mendler 
Commit: Daniel Mendler 

Do not delete transient pin on ignored commands
---
 osm.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osm.el b/osm.el
index f2bc0713d6..617039fdc5 100644
--- a/osm.el
+++ b/osm.el
@@ -884,7 +884,8 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 (with-current-buffer buffer
   ;; Handle bookmark deletion and renaming
   (pcase this-command
-('undefined nil)
+((or 'undefined 'ignore)
+ nil)
 ((and (guard (eq id 'selected-bookmark))
   cmd (or 'osm-bookmark-delete 'osm-bookmark-rename))
  (remove-hook 'pre-command-hook sym)

[elpa] externals/osm c648edc1b2 1/6: Add osm-bookmark-rename

[ELPA Syncer]

branch: externals/osm
commit c648edc1b2621f3b5effd0c86849a75a801c01d8
Author: Daniel Mendler 
Commit: Daniel Mendler 

Add osm-bookmark-rename
---
 README.org |  1 +
 osm.el | 35 +++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/README.org b/README.org
index f655bd2093..d57feaee86 100644
--- a/README.org
+++ b/README.org
@@ -82,6 +82,7 @@ Key bindings in =osm-mode= buffer:
 - ~~: =osm-bookmark-delete-click= - Click on bookmark at 
point to delete
 - ~~: =osm-drag= - Drag the map with the mouse
 - ~d~, ~DEL~: =osm-bookmark-delete= - Delete selected bookmark
+- ~n~: =osm-bookmark-rename= - Rename selected bookmark
 - ~g~: =osm-goto= - Go to location
 - ~h~: =osm-home= - Go to home location
 - ~s~: =osm-search= - Search for location
diff --git a/osm.el b/osm.el
index 9b92b1a20f..229d3611b1 100644
--- a/osm.el
+++ b/osm.el
@@ -167,6 +167,7 @@ Should be at least 7 days according to the server usage 
policies."
 (define-key map [M-down] #'osm-down-down)
 (define-key map [M-left] #'osm-left-left)
 (define-key map [M-right] #'osm-right-right)
+(define-key map "n" #'osm-bookmark-rename)
 (define-key map "d" #'osm-bookmark-delete)
 (define-key map "\d" #'osm-bookmark-delete)
 (define-key map "c" #'clone-buffer)
@@ -444,7 +445,7 @@ Should be at least 7 days according to the server usage 
policies."
   (when (and (>= q y) (< q (+ y 50)) (>= p (- x 20)) (< p (+ x 20)) (< 
d min))
 (setq min d found (list p q (car bm)))
 (when found
-  (message "Selected '%s'" (cddr found))
+  (message "%s" (caddr found))
   (apply #'osm--put-transient-pin 'selected-bookmark found)
   (osm--update
 
@@ -875,12 +876,18 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 (fset sym (lambda ()
 (with-current-buffer buffer
   (remove-hook 'pre-command-hook sym)
-  (setq osm--transient-pin nil)
-  ;; HACK: handle bookmark deletion
-  (when (and (eq this-command #'osm-bookmark-delete)
- (eq id 'selected-bookmark))
-(osm-bookmark-delete help)
-(setq this-command #'ignore)
+  ;; HACK: handle bookmark deletion and renaming
+  (pcase this-command
+((and (guard (eq id 'selected-bookmark))
+  cmd (or 'osm-bookmark-delete 'osm-bookmark-rename))
+ (setq osm--transient-pin nil
+   this-command
+   (lambda ()
+ (interactive)
+ (funcall cmd help
+((guard 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
 
@@ -911,6 +918,18 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (bookmark-delete bm)
   (osm--revert))
 
+;;;###autoload
+(defun osm-bookmark-rename (old-name)
+  "Rename osm bookmark OLD-NAME."
+  (interactive (list (car (osm--bookmark-read
+  (unwind-protect
+  (bookmark-rename
+   old-name
+   (read-from-minibuffer
+"New name: " old-name nil nil
+'bookmark-history old-name))
+(osm--revert)))
+
 (defun osm--bookmark-read ()
   "Read bookmark name."
   (bookmark-maybe-load-default-file)
@@ -933,7 +952,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (unwind-protect
   (pcase-let* ((`(,lat ,lon ,desc) (osm--location-data 'selected-bookmark 
"Bookmark"))
(def (osm--bookmark-name desc))
-   (name (read-from-minibuffer "Bookmark name: " def nil nil 
nil def))
+   (name (read-from-minibuffer "Bookmark name: " def nil nil 
'bookmark-history def))
(bookmark-make-record-function
 (lambda () (osm--make-bookmark name lat lon
 (bookmark-set name)

[elpa] externals/osm 13db645b7c 4/6: Ignore click

[ELPA Syncer]

branch: externals/osm
commit 13db645b7c317b93a1be9e775b8ea6af73936086
Author: Daniel Mendler 
Commit: Daniel Mendler 

Ignore click
---
 osm.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osm.el b/osm.el
index c4d839ed84..f2bc0713d6 100644
--- a/osm.el
+++ b/osm.el
@@ -142,6 +142,7 @@ Should be at least 7 days according to the server usage 
policies."
   (let ((map (make-sparse-keymap)))
 (define-key map [org-link] #'ignore)
 (define-key map [center] #'ignore)
+(define-key map [home] #'ignore)
 (define-key map [selected-bookmark] #'ignore)
 (define-key map [bookmark mouse-1] #'osm-bookmark-select-click)
 (define-key map [bookmark mouse-2] #'osm-bookmark-select-click)

[elpa] externals/osm fcd5d289d0 3/6: Always display home pin

[ELPA Syncer]

branch: externals/osm
commit fcd5d289d0bc69d859861a7fbc92510ec2576bfe
Author: Daniel Mendler 
Commit: Daniel Mendler 

Always display home pin
---
 osm.el | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osm.el b/osm.el
index 0c79452f24..c4d839ed84 100644
--- a/osm.el
+++ b/osm.el
@@ -98,6 +98,7 @@
   '((selected-bookmark "#e20" "#600")
 (bookmark "#f80" "#820")
 (center "#08f" "#028")
+(home "#80f" "#208")
 (org-link "#7a9" "#254"))
   "Colors of pins."
   :type '(alist :key-type symbol :value-type (list string string)))
@@ -591,15 +592,20 @@ Should be at least 7 days according to the server usage 
policies."
 (defun osm--update-pins ()
   "Compute pin positions."
   (setq osm--pins (make-hash-table :test #'equal))
+  (osm--put-pin 'home
+(osm--lon-to-x (cadr osm-home) osm--zoom)
+(osm--lat-to-y (car osm-home) osm--zoom)
+"Home")
   (when osm--transient-pin
 (apply #'osm--put-pin osm--transient-pin))
   (bookmark-maybe-load-default-file)
   (dolist (bm bookmark-alist)
 (when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
-  (let* ((coord (bookmark-prop-get bm 'coordinates))
- (x (osm--lon-to-x (cadr coord) osm--zoom))
- (y (osm--lat-to-y (car coord) osm--zoom)))
-(osm--put-pin 'bookmark x y (car bm))
+  (let ((coord (bookmark-prop-get bm 'coordinates)))
+(osm--put-pin 'bookmark
+  (osm--lon-to-x (cadr coord) osm--zoom)
+  (osm--lat-to-y (car coord) osm--zoom)
+  (car bm))
 
 (autoload 'svg--image-data "svg")
 (defun osm--make-tile (x y)

[elpa] externals/osm b05a2514d2 6/6: Generated osm-prefixed key events

[ELPA Syncer]

branch: externals/osm
commit b05a2514d2a12caefc4e2e02af2e760dc96d3705
Author: Daniel Mendler 
Commit: Daniel Mendler 

Generated osm-prefixed key events
---
 osm.el | 39 ---
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/osm.el b/osm.el
index 617039fdc5..6e695805af 100644
--- a/osm.el
+++ b/osm.el
@@ -95,11 +95,11 @@
   :type '(alist :key-type symbol :value-type plist))
 
 (defcustom osm-pin-colors
-  '((selected-bookmark "#e20" "#600")
-(bookmark "#f80" "#820")
-(center "#08f" "#028")
-(home "#80f" "#208")
-(org-link "#7a9" "#254"))
+  '((osm-selected-bookmark "#e20" "#600")
+(osm-bookmark "#f80" "#820")
+(osm-center "#08f" "#028")
+(osm-home "#80f" "#208")
+(osm-org-link "#7a9" "#254"))
   "Colors of pins."
   :type '(alist :key-type symbol :value-type (list string string)))
 
@@ -140,13 +140,14 @@ Should be at least 7 days according to the server usage 
policies."
 
 (defvar osm-mode-map
   (let ((map (make-sparse-keymap)))
-(define-key map [org-link] #'ignore)
-(define-key map [center] #'ignore)
-(define-key map [home] #'ignore)
-(define-key map [selected-bookmark] #'ignore)
-(define-key map [bookmark mouse-1] #'osm-bookmark-select-click)
-(define-key map [bookmark mouse-2] #'osm-bookmark-select-click)
-(define-key map [bookmark mouse-3] #'osm-bookmark-select-click)
+(define-key map [osm-home] #'ignore)
+(define-key map [osm-org-link] #'ignore)
+(define-key map [osm-center] #'ignore)
+(define-key map [osm-selected-bookmark] #'ignore)
+(define-key map [osm-bookmark mouse-1] #'osm-bookmark-select-click)
+(define-key map [osm-bookmark mouse-2] #'osm-bookmark-select-click)
+(define-key map [osm-osm-bookmark mouse-3] #'osm-bookmark-select-click)
+(define-key map [home] #'osm-home)
 (define-key map "+" #'osm-zoom-in)
 (define-key map "-" #'osm-zoom-out)
 (define-key map " " #'osm-zoom-in)
@@ -407,14 +408,14 @@ Should be at least 7 days according to the server usage 
policies."
 (when (< osm--zoom (osm--server-property :max-zoom))
   (cl-incf osm--x (- x osm--wx))
   (cl-incf osm--y (- y osm--wy))
-  (osm--put-transient-pin 'center osm--x osm--y "Center")
+  (osm--put-transient-pin 'osm-center osm--x osm--y "Center")
   (osm--update
 
 (defun osm-bookmark-set-click (event)
   "Create bookmark at position of click EVENT."
   (interactive "@e")
   (pcase-let ((`(,x . ,y) (posn-x-y (event-start event
-(osm--put-transient-pin 'selected-bookmark
+(osm--put-transient-pin 'osm-selected-bookmark
 (+ osm--x (- x osm--wx))
 (+ osm--y (- y osm--wy))
 "New bookmark")
@@ -424,7 +425,7 @@ Should be at least 7 days according to the server usage 
policies."
   "Store link at position of click EVENT."
   (interactive "@e")
   (pcase-let ((`(,x . ,y) (posn-x-y (event-start event
-(osm--put-transient-pin 'org-link
+(osm--put-transient-pin 'osm-org-link
 (+ osm--x (- x osm--wx))
 (+ osm--y (- y osm--wy))
 "New Org Link")
@@ -448,7 +449,7 @@ Should be at least 7 days according to the server usage 
policies."
 (setq min d found (list p q (car bm)))
 (when found
   (message "%s" (caddr found))
-  (apply #'osm--put-transient-pin 'selected-bookmark found)
+  (apply #'osm--put-transient-pin 'osm-selected-bookmark found)
   (osm--update
 
 (defun osm-zoom-in (&optional n)
@@ -593,7 +594,7 @@ Should be at least 7 days according to the server usage 
policies."
 (defun osm--update-pins ()
   "Compute pin positions."
   (setq osm--pins (make-hash-table :test #'equal))
-  (osm--put-pin 'home
+  (osm--put-pin 'osm-home
 (osm--lon-to-x (cadr osm-home) osm--zoom)
 (osm--lat-to-y (car osm-home) osm--zoom)
 "Home")
@@ -603,7 +604,7 @@ Should be at least 7 days according to the server usage 
policies."
   (dolist (bm bookmark-alist)
 (when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
   (let ((coord (bookmark-prop-get bm 'coordinates)))
-(osm--put-pin 'bookmark
+(osm--put-pin 'osm-bookmark
   (osm--lon-to-x (cadr coord) osm--zoom)
   (osm--lat-to-y (car coord) osm--zoom)
   (car bm))
@@ -872,7 +873,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 osm--zoom (nth 2 at)
 osm--x (osm--lon-to-x (nth 1 at) osm--zoom)
 osm--y (osm--lat-to-y (nth 0 at) osm--zoom))
-  (osm--put-transient-pin 'center osm--x osm--y "Center"))
+  (osm--put-transient-pin 'osm-center osm--x osm--y "Center"))
 (prog1 (pop-to-buffer (current-buffer))
   (osm--update
 

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

[ELPA Syncer]

branch: externals/osm
commit 037d0213acf6d56519e8e4c60c01f8b7121e228a
Author: Daniel Mendler 
Commit: Daniel Mendler 

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
 

[nongnu] elpa/clojure-mode b7d08b87f6: 5.14.0

[ELPA Syncer]

branch: elpa/clojure-mode
commit b7d08b87f6a116ff47b33ee857926b60c66c3ab7
Author: vemv 
Commit: vemv 

5.14.0
---
 CHANGELOG.md| 2 ++
 README.md   | 6 +++---
 clojure-mode.el | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 681623ecd9..88e7ab0970 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+## 5.14.0 (2022-03-07)
+
 ### New features
 
 * Allow additional directories, beyond the default `clj[sc]`, to be correctly 
formulated by `clojure-expected-ns` via new `defcustom` entitled 
`clojure-directory-prefixes`
diff --git a/README.md b/README.md
index 85610f159d..d837e0e24a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ highlighting), indentation, navigation and refactoring 
support for the
 **This documentation tracks the `master` branch of `clojure-mode`. Some of
 the features and settings discussed here might not be available in
 older releases (including the current stable release). Please, consult
-the relevant git tag (e.g. 5.1.0) if you need documentation for a
+the relevant git tag (e.g. 5.14.0) if you need documentation for a
 specific `clojure-mode` release.**
 
 ## Installation
@@ -126,7 +126,7 @@ The indentation of function forms is configured by the 
variable
2)
 ```
 
-**Note:** Prior to clojure-mode 5.10 the configuration options for 
`clojure-indent-style` used to be
+**Note:** Prior to clojure-mode 5.10, the configuration options for 
`clojure-indent-style` used to be
 keywords, but now they are symbols. Keywords will still be supported at least 
until clojure-mode 6.
 
  Indentation of macro forms
@@ -559,7 +559,7 @@ An extensive changelog is available [here](CHANGELOG.md).
 
 ## License
 
-Copyright © 2007-2021 Jeffrey Chu, Lennart Staflin, Phil Hagelberg, Bozhidar
+Copyright © 2007-2022 Jeffrey Chu, Lennart Staflin, Phil Hagelberg, Bozhidar
 Batsov, Artur Malabarba, Magnar Sveen and [contributors][].
 
 Distributed under the GNU General Public License; type C-h C-c to 
view it.
diff --git a/clojure-mode.el b/clojure-mode.el
index fd03c37f27..2bb617780d 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -1,7 +1,7 @@
 ;;; clojure-mode.el --- Major mode for Clojure code -*- lexical-binding: t; -*-
 
 ;; Copyright © 2007-2013 Jeffrey Chu, Lennart Staflin, Phil Hagelberg
-;; Copyright © 2013-2021 Bozhidar Batsov, Artur Malabarba, Magnar Sveen
+;; Copyright © 2013-2022 Bozhidar Batsov, Artur Malabarba, Magnar Sveen
 ;;
 ;; Authors: Jeffrey Chu 
 ;;   Lennart Staflin 
@@ -12,7 +12,7 @@
 ;; Maintainer: Bozhidar Batsov 
 ;; URL: http://github.com/clojure-emacs/clojure-mode
 ;; Keywords: languages clojure clojurescript lisp
-;; Version: 5.13.0
+;; Version: 5.14.0
 ;; Package-Requires: ((emacs "25.1"))
 
 ;; This file is not part of GNU Emacs.

[elpa] externals/taxy 5907b7cd3c: Docs: Unhide results in readme for GitHub

[ELPA Syncer]

branch: externals/taxy
commit 5907b7cd3c976d83f7323aa264a589746c7a7367
Author: Adam Porter 
Commit: Adam Porter 

Docs: Unhide results in readme for GitHub
---
 README.org | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index d69f67dd4b..3246497935 100644
--- a/README.org
+++ b/README.org
@@ -806,9 +806,10 @@ Finally, rather than using a pre-made taxy struct, we make 
one at runtime, makin
   taxy-plain))
 #+end_src
 
+# NOTE: The #+RESULTS: header is removed for the following results block, 
because it seems to cause the GitHub renderer to hide it.
+
 Which gives us:
 
-#+RESULTS:
 #+begin_src elisp
   ("Sporty (DSL)"
((indoor
@@ -845,9 +846,10 @@ This also allows the grouping keys to be easily changed at 
runtime, producing a
 :keys '((uses 'ball) venue))
 #+end_src
 
+# NOTE: The #+RESULTS: header is removed for the following results block, 
because it seems to cause the GitHub renderer to hide it.
+
 And this produces:
 
-#+RESULTS:
 #+begin_src elisp :exports code
   ("Sporty (DSL)"
((outdoor

[nongnu] elpa/git-commit updated (bdd2f13fed -> 10b5407131)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-commit.

  from  bdd2f13fed AUTHORS.md: Update list of contributors
   new  65560b1566 Avoid highlighting twice when refreshing
   new  10b5407131 magit-diff-highlight-list: Ensure delayed highlighting 
takes place


Summary of changes:
 lisp/magit-diff.el| 3 ++-
 lisp/magit-section.el | 6 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

[nongnu] elpa/git-commit 10b5407131 2/2: magit-diff-highlight-list: Ensure delayed highlighting takes place

[ELPA Syncer]

branch: elpa/git-commit
commit 10b5407131d4299ca9ed038a23a3a41bcaac14fc
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-diff-highlight-list: Ensure delayed highlighting takes place
---
 lisp/magit-diff.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index a5183b6899..dd384e870c 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -3022,7 +3022,8 @@ are highlighted."
   (unless (and (region-active-p)
(<= (region-beginning) beg))
 (magit-section-make-overlay beg cnt 'magit-section-highlight))
-  (unless (oref section hidden)
+  (if (oref section hidden)
+  (oset section washer #'ignore)
 (dolist (child (oref section children))
   (when (or (eq this-command 'mouse-drag-region)
 (not (and (region-active-p)

[nongnu] elpa/git-commit 65560b1566 1/2: Avoid highlighting twice when refreshing

[ELPA Syncer]

branch: elpa/git-commit
commit 65560b156641068ecb466f9d719c6c3cb2fac5c9
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Avoid highlighting twice when refreshing

`magit-refresh' and `magit-refresh-all' update highlighting
explicitly because they might have to do it in multiple buffers.
---
 lisp/magit-section.el | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 01c498a451..fcaae1d979 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -366,7 +366,7 @@ Magit-Section is documented in info node `(magit-section)'."
   (make-local-variable 'text-property-default-nonsticky)
   (push (cons 'keymap t) text-property-default-nonsticky)
   (add-hook 'pre-command-hook #'magit-section-pre-command-hook nil t)
-  (add-hook 'post-command-hook #'magit-section-update-highlight t t)
+  (add-hook 'post-command-hook #'magit-section-post-command-hook t t)
   (add-hook 'deactivate-mark-hook #'magit-section-deactivate-mark t t)
   (setq-local redisplay-highlight-region-function
   'magit-section--highlight-region)
@@ -1262,6 +1262,10 @@ evaluated its BODY.  Admittedly that's a bit of a hack."
   (setq magit-section-pre-command-region-p (region-active-p))
   (setq magit-section-pre-command-section (magit-current-section)))
 
+(defun magit-section-post-command-hook ()
+  (unless (memq this-command '(magit-refresh magit-refresh-all))
+(magit-section-update-highlight)))
+
 (defun magit-section-deactivate-mark ()
   (setq magit-section-highlight-force-update t))
 

[nongnu] elpa/magit updated (bdd2f13fed -> 10b5407131)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  bdd2f13fed AUTHORS.md: Update list of contributors
  adds  65560b1566 Avoid highlighting twice when refreshing
  adds  10b5407131 magit-diff-highlight-list: Ensure delayed highlighting 
takes place

No new revisions were added by this update.

Summary of changes:
 lisp/magit-diff.el| 3 ++-
 lisp/magit-section.el | 6 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

[nongnu] elpa/magit-section updated (bdd2f13fed -> 10b5407131)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  bdd2f13fed AUTHORS.md: Update list of contributors
  adds  65560b1566 Avoid highlighting twice when refreshing
  adds  10b5407131 magit-diff-highlight-list: Ensure delayed highlighting 
takes place

No new revisions were added by this update.

Summary of changes:
 lisp/magit-diff.el| 3 ++-
 lisp/magit-section.el | 6 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

[elpa] externals/osm 9e42febac7: Add osm-tile-border customization option

[ELPA Syncer]

branch: externals/osm
commit 9e42febac72226be310bfe62ade2fb61fe158391
Author: Daniel Mendler 
Commit: Daniel Mendler 

Add osm-tile-border customization option
---
 osm.el | 31 ---
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/osm.el b/osm.el
index 6e695805af..acd49a701d 100644
--- a/osm.el
+++ b/osm.el
@@ -116,6 +116,11 @@
   "Scroll step in pixel."
   :type 'integer)
 
+(defcustom osm-tile-border nil
+  "Display tile borders.
+Useful for debugging."
+  :type 'boolean)
+
 (defcustom osm-small-step 16
   "Scroll step in pixel."
   :type 'integer)
@@ -612,22 +617,23 @@ Should be at least 7 days according to the server usage 
policies."
 (autoload 'svg--image-data "svg")
 (defun osm--make-tile (x y)
   "Make tile at X/Y from FILE."
-  (let ((file (osm--tile-file x y osm--zoom)))
+  (let ((file (osm--tile-file x y osm--zoom))
+(pins (gethash (cons x y) osm--pins)))
 (when (file-exists-p file)
   `(image
 :width 256 :height 256
-,@(if-let (pins (gethash (cons x y) osm--pins))
+,@(if (or osm-tile-border pins)
   (let* ((areas nil)
  (svg-pins
   (mapconcat
(lambda (pin)
  (pcase-let* ((`(,p ,q ,id . ,help) pin)
   (`(,_ ,bg ,fg) (assq id osm-pin-colors)))
-(push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 
50) ,(+ p 20) ,(- q 40) ])
-,id (help-echo ,(truncate-string-to-width help 
20 0 nil t) pointer hand))
-  areas)
-;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
-(format "
+   (push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 
50) ,(+ p 20) ,(- q 40) ])
+   ,id (help-echo ,(truncate-string-to-width 
help 20 0 nil t) pointer hand))
+ areas)
+   ;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
+   (format "
 
 
 " bg fg p q)))
-  pins "")))
+   pins "")))
 (list :type 'svg :base-uri file :map areas
   :data (concat "
@@ -649,7 +655,10 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
(if (member (file-name-extension file) 
'("jpg" "jpeg"))
"image/jpeg" "image/png")
nil))
-"' height='256' width='256'/>" svg-pins 
"")))
+"' height='256' width='256'/>" svg-pins
+(and osm-tile-border
+ "")
+"")))
 (list :type
   (if (member (file-name-extension file) '("jpg" "jpeg"))
   'jpeg 'png)
@@ -658,7 +667,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 (defun osm--get-tile (x y)
   "Get tile at X/Y."
   (if (pcase osm--transient-pin
-   (`(,_id ,p ,q . ,_) (osm--pin-at-p x y p q)))
+(`(,_id ,p ,q . ,_) (osm--pin-at-p x y p q)))
   (osm--make-tile x y)
 (let* ((key `(,osm-server ,osm--zoom ,x . ,y))
(tile (and osm--tiles (gethash key osm--tiles
@@ -1073,7 +1082,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
#'osm-zoom-out #'osm-zoom-in #'osm-bookmark-set))
   (put sym 'command-modes '(osm-mode)))
 (dolist (sym (list #'osm-drag #'osm-center-click #'osm-org-link-click
-#'osm-bookmark-set-click #'osm-bookmark-select-click))
+   #'osm-bookmark-set-click #'osm-bookmark-select-click))
   (put sym 'completion-predicate #'ignore))
 
 (provide 'osm)

[nongnu] elpa/clojure-mode c339353f9e: Fix a misplaced changelog entry

[ELPA Syncer]

branch: elpa/clojure-mode
commit c339353f9e649b3af084f1bb6ce759e614a2f243
Author: vemv 
Commit: vemv 

Fix a misplaced changelog entry

See 
https://github.com/clojure-emacs/clojure-mode/commit/76b6df0f398678570cf70bcf809d2c3af2ff7f64#commitcomment-68145677
---
 CHANGELOG.md | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e7ab0970..8f6104f179 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@
 
 * [#604](https://github.com/clojure-emacs/clojure-mode/pull/604): Add `bb` 
(babashka) to `interpreter-mode-alist`.
 
+### Bugs fixed
+
+* [#608](https://github.com/clojure-emacs/clojure-mode/issues/608) Fix 
alignment issue involving margin comments at the end of nested forms.
+
 ## 5.13.0 (2021-05-05)
 
 ### New features
@@ -26,7 +30,6 @@
 
 * [#588](https://github.com/clojure-emacs/clojure-mode/pull/588): Fix 
font-lock for character literals.
 * Stop `clojure-sort-ns` from calling `redisplay`.
-* [#608](https://github.com/clojure-emacs/clojure-mode/issues/608) Fix 
alignment issue involving margin comments at the end of nested forms.
 
 ### Changes
 

[elpa] externals/osm 549aac0d21: Fix invalid pin ids

[ELPA Syncer]

branch: externals/osm
commit 549aac0d218bc54f7390a256bb7afb644423d027
Author: Daniel Mendler 
Commit: Daniel Mendler 

Fix invalid pin ids
---
 osm.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osm.el b/osm.el
index acd49a701d..029c0b7137 100644
--- a/osm.el
+++ b/osm.el
@@ -829,7 +829,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
 
 (defun osm--org-link-data ()
   "Return Org link data."
-  (pcase-let ((`(,lat ,lon ,name) (osm--location-data 'org-link "Org link")))
+  (pcase-let ((`(,lat ,lon ,name) (osm--location-data 'osm-org-link "Org 
link")))
 (setq name (string-remove-prefix "osm: " (osm--bookmark-name name)))
 (list lat lon osm--zoom
   (and (not (eq osm-server (default-value 'osm-server))) osm-server)
@@ -896,7 +896,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (pcase this-command
 ((or 'undefined 'ignore)
  nil)
-((and (guard (eq id 'selected-bookmark))
+((and (guard (eq id 'osm-selected-bookmark))
   cmd (or 'osm-bookmark-delete 'osm-bookmark-rename))
  (remove-hook 'pre-command-hook sym)
  (setq osm--transient-pin nil
@@ -971,7 +971,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (unless (eq major-mode #'osm-mode)
 (error "Not an osm-mode buffer"))
   (unwind-protect
-  (pcase-let* ((`(,lat ,lon ,desc) (osm--location-data 'selected-bookmark 
"Bookmark"))
+  (pcase-let* ((`(,lat ,lon ,desc) (osm--location-data 
'osm-selected-bookmark "Bookmark"))
(def (osm--bookmark-name desc))
(name (read-from-minibuffer "Bookmark name: " def nil nil 
'bookmark-history def))
(bookmark-make-record-function

[nongnu] elpa/geiser 76b19057f9: Nit (fixes #38)

[ELPA Syncer]

branch: elpa/geiser
commit 76b19057f97e834f2873c502d7bd66a31b1d0b17
Author: jao 
Commit: jao 

Nit (fixes #38)
---
 elisp/geiser-syntax.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index c1cced77ec..a5fc54ffa6 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -515,7 +515,7 @@ implementation-specific entries for font-lock-keywords.")
 (buffer-undo-list t)
 (geiser-buffer (current-buffer)))
 (with-current-buffer
-(get-buffer-create " *Geiser repl fontification*")
+(get-buffer-create " *Geiser REPL fontification*")
   (let ((inhibit-modification-hooks nil))
 (erase-buffer)
 ;; Add string and a final space to ensure property change.

[elpa] externals/osm 33f20dcc04 2/3: Simplify pin code (2)

[ELPA Syncer]

branch: externals/osm
commit 33f20dcc042aa397a9eecbce271e6f242136156d
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify pin code (2)
---
 osm.el | 93 --
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/osm.el b/osm.el
index c5462add3d..9c1493c7c6 100644
--- a/osm.el
+++ b/osm.el
@@ -601,8 +601,6 @@ Should be at least 7 days according to the server usage 
policies."
 (osm--lon-to-x (cadr osm-home) osm--zoom)
 (osm--lat-to-y (car osm-home) osm--zoom)
 "Home")
-  (when osm--transient-pin
-(apply #'osm--put-pin osm--transient-pin))
   (bookmark-maybe-load-default-file)
   (dolist (bm bookmark-alist)
 (when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
@@ -613,68 +611,67 @@ Should be at least 7 days according to the server usage 
policies."
   (car bm))
 
 (autoload 'svg--image-data "svg")
-(defun osm--make-tile (x y)
-  "Make tile at X/Y from FILE."
+(defun osm--make-tile (x y tpin)
+  "Make tile at X/Y from FILE.
+TPIN is an optional transient pin."
   (let ((file (osm--tile-file x y osm--zoom))
 (pins (gethash (cons x y) osm--pins)))
 (when (file-exists-p file)
-  `(image
-:width 256 :height 256
-,@(if (or osm-tile-border pins)
-  (let* ((areas nil)
- (x0 (* 256 x))
- (y0 (* 256 y))
- (svg-pins
-  (mapconcat
-   (lambda (pin)
- (pcase-let* ((`(,p ,q ,id . ,help) pin)
-  (`(,_ ,bg ,fg) (assq id osm-pin-colors)))
-   (setq p (- p x0) q (- q y0))
-   (push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 
50) ,(+ p 20) ,(- q 40) ])
-   ,id (help-echo ,(truncate-string-to-width 
help 20 0 nil t) pointer hand))
- areas)
-   ;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
-   (format "
+  (if (or osm-tile-border tpin pins)
+  (let* ((areas nil)
+ (x0 (* 256 x))
+ (y0 (* 256 y))
+ (svg-pin
+  (lambda (pin)
+(pcase-let* ((`(,p ,q ,id . ,help) pin)
+ (`(,_ ,bg ,fg) (assq id osm-pin-colors)))
+  (setq p (- p x0) q (- q y0))
+  (push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 50) 
,(+ p 20) ,(- q 40) ])
+  ,id (help-echo ,(truncate-string-to-width help 
20 0 nil t) pointer hand))
+areas)
+  ;; 
https://commons.wikimedia.org/wiki/File:Simpleicons_Places_map-marker-1.svg
+  (format "
 
 
-" bg fg p q)))
-   pins "")))
-(list :type 'svg :base-uri file :map areas
-  :data (concat "" bg fg p q
+ (svg-text
+  (concat "
 " svg-pins
-(and osm-tile-border
- "")
-"")))
-(list :type
-  (if (member (file-name-extension file) '("jpg" "jpeg"))
-  'jpeg 'png)
-  :file file))
+  (if (> emacs-major-version 27)
+  (file-name-nondirectory file)
+;; NOTE: On Emacs 27, :base-uri and embedding by 
file
+;; path is not supported. Use the less efficient 
base64 encoding.
+(svg--image-data
+ file
+ (if (member (file-name-extension file) '("jpg" 
"jpeg"))
+ "image/jpeg" "image/png")
+ nil))
+  "' height='256' width='256'/>"
+  (mapconcat svg-pin pins "")
+  (and tpin (funcall svg-pin tpin))
+  (and osm-tile-border
+   "")
+  "")))
+(list 'image :width 256 :height 256 :type 'svg :base-uri file 
:data svg-text :map areas))
+(list 'image :width 256 :height 256 :file file :type
+  (if (member (file-name-extension file) '("jpg" "jpeg"))
+  'jpeg 'png))
 
 (defun osm--get-tile (x y)
   "Get tile at X/Y."
   (if (pcase osm--transient-pin
-(`(,_id ,p ,q . ,_) (osm--pin-at-p x y p q)))
-  (osm--make-tile x y)
+(`(,p ,q . ,_) (osm--pin-at-p x y p q)))
+  (osm--make-tile x y osm--transient-pin)
 (let* ((key `(,osm-server ,osm--zoom ,x . ,y))
(tile (and osm--tiles (gethash key osm

[elpa] externals/osm c56af2abe8 3/3: Only update pins when needed

[ELPA Syncer]

branch: externals/osm
commit c56af2abe8d1cb4b1d1b2653ef97af1bc08255a9
Author: Daniel Mendler 
Commit: Daniel Mendler 

Only update pins when needed
---
 osm.el | 48 +---
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/osm.el b/osm.el
index 9c1493c7c6..4333dc15a2 100644
--- a/osm.el
+++ b/osm.el
@@ -581,10 +581,10 @@ Should be at least 7 days according to the server usage 
policies."
   (and (>= p (- x 32)) (< p (+ x 256 32))
(>= q y) (< q (+ y 256 64
 
-(defun osm--put-pin (id x y help)
-  "Put pin at X/Y with HELP and ID in pins hash table."
+(defun osm--put-pin (pins id x y help)
+  "Put pin at X/Y with HELP and ID in PINS hash table."
   (let ((x0 (/ x 256)) (y0 (/ y 256)))
-(push `(,x, y ,id . ,help) (gethash (cons x0 y0) osm--pins))
+(push `(,x, y ,id . ,help) (gethash (cons x0 y0) pins))
 (cl-loop
  for i from -1 to 1 do
  (cl-loop
@@ -592,30 +592,33 @@ Should be at least 7 days according to the server usage 
policies."
   (let ((x1 (/ (+ x (* 32 i)) 256))
 (y1 (/ (+ y (* 64 j)) 256)))
 (unless (and (= x0 x1) (= y0 y1))
-  (push `(,x ,y ,id . ,help) (gethash (cons x1 y1) osm--pins
-
-(defun osm--update-pins ()
-  "Compute pin positions."
-  (setq osm--pins (make-hash-table :test #'equal))
-  (osm--put-pin 'osm-home
-(osm--lon-to-x (cadr osm-home) osm--zoom)
-(osm--lat-to-y (car osm-home) osm--zoom)
-"Home")
-  (bookmark-maybe-load-default-file)
-  (dolist (bm bookmark-alist)
-(when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
-  (let ((coord (bookmark-prop-get bm 'coordinates)))
-(osm--put-pin 'osm-bookmark
-  (osm--lon-to-x (cadr coord) osm--zoom)
-  (osm--lat-to-y (car coord) osm--zoom)
-  (car bm))
+  (push `(,x ,y ,id . ,help) (gethash (cons x1 y1) pins
+
+(defun osm--get-pins (x y)
+  "Compute pin positions and get pin at X/Y."
+  (unless (eq (car osm--pins) osm--zoom)
+(let ((pins (make-hash-table :test #'equal)))
+  (osm--put-pin pins 'osm-home
+(osm--lon-to-x (cadr osm-home) osm--zoom)
+(osm--lat-to-y (car osm-home) osm--zoom)
+"Home")
+  (bookmark-maybe-load-default-file)
+  (dolist (bm bookmark-alist)
+(when (eq (bookmark-prop-get bm 'handler) #'osm-bookmark-jump)
+  (let ((coord (bookmark-prop-get bm 'coordinates)))
+(osm--put-pin pins 'osm-bookmark
+  (osm--lon-to-x (cadr coord) osm--zoom)
+  (osm--lat-to-y (car coord) osm--zoom)
+  (car bm)
+  (setq osm--pins (cons osm--zoom pins
+  (gethash (cons x y) (cdr osm--pins)))
 
 (autoload 'svg--image-data "svg")
 (defun osm--make-tile (x y tpin)
   "Make tile at X/Y from FILE.
 TPIN is an optional transient pin."
   (let ((file (osm--tile-file x y osm--zoom))
-(pins (gethash (cons x y) osm--pins)))
+(pins (osm--get-pins x y)))
 (when (file-exists-p file)
   (if (or osm-tile-border tpin pins)
   (let* ((areas nil)
@@ -714,7 +717,7 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (dolist (buf (buffer-list))
 (when (eq (buffer-local-value 'major-mode buf) #'osm-mode)
   (with-current-buffer buf
-(when osm--tiles (clrhash osm--tiles))
+(setq osm--tiles nil osm--pins nil)
 (osm--update)
 
 (defun osm--resize (&rest _)
@@ -758,7 +761,6 @@ xmlns='http://www.w3.org/2000/svg' 
xmlns:xlink='http://www.w3.org/1999/xlink'>
   (rename-buffer (osm--buffer-name) 'unique)
   (osm--update-sizes)
   (osm--update-header)
-  (osm--update-pins)
   (osm--update-buffer)
   (osm--process-queue)
   (osm--purge-tiles)

[elpa] externals/osm 8e60d933f4 1/3: Simplify pin code

[ELPA Syncer]

branch: externals/osm
commit 8e60d933f452edc0931447b64206802c27415fd5
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify pin code
---
 osm.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osm.el b/osm.el
index 029c0b7137..c5462add3d 100644
--- a/osm.el
+++ b/osm.el
@@ -584,8 +584,7 @@ Should be at least 7 days according to the server usage 
policies."
 (defun osm--put-pin (id x y help)
   "Put pin at X/Y with HELP and ID in pins hash table."
   (let ((x0 (/ x 256)) (y0 (/ y 256)))
-(push `(,(- x (* x0 256)) ,(- y (* y0 256)) ,id . ,help)
-  (gethash (cons x0 y0) osm--pins))
+(push `(,x, y ,id . ,help) (gethash (cons x0 y0) osm--pins))
 (cl-loop
  for i from -1 to 1 do
  (cl-loop
@@ -593,8 +592,7 @@ Should be at least 7 days according to the server usage 
policies."
   (let ((x1 (/ (+ x (* 32 i)) 256))
 (y1 (/ (+ y (* 64 j)) 256)))
 (unless (and (= x0 x1) (= y0 y1))
-  (push `(,(- x (* x1 256)) ,(- y (* y1 256)) ,id . ,help)
-(gethash (cons x1 y1) osm--pins
+  (push `(,x ,y ,id . ,help) (gethash (cons x1 y1) osm--pins
 
 (defun osm--update-pins ()
   "Compute pin positions."
@@ -624,11 +622,14 @@ Should be at least 7 days according to the server usage 
policies."
 :width 256 :height 256
 ,@(if (or osm-tile-border pins)
   (let* ((areas nil)
+ (x0 (* 256 x))
+ (y0 (* 256 y))
  (svg-pins
   (mapconcat
(lambda (pin)
  (pcase-let* ((`(,p ,q ,id . ,help) pin)
   (`(,_ ,bg ,fg) (assq id osm-pin-colors)))
+   (setq p (- p x0) q (- q y0))
(push `((poly . [,p ,q ,(- p 20) ,(- q 40) ,p ,(- q 
50) ,(+ p 20) ,(- q 40) ])
,id (help-echo ,(truncate-string-to-width 
help 20 0 nil t) pointer hand))
  areas)

[elpa] externals/osm updated (549aac0d21 -> c56af2abe8)

[ELPA Syncer]

elpasync pushed a change to branch externals/osm.

  from  549aac0d21 Fix invalid pin ids
   new  8e60d933f4 Simplify pin code
   new  33f20dcc04 Simplify pin code (2)
   new  c56af2abe8 Only update pins when needed


Summary of changes:
 osm.el | 140 -
 1 file changed, 70 insertions(+), 70 deletions(-)

[nongnu] elpa/proof-general d9cfe74845: docs: Improve MELPA doc (#642)

[ELPA Syncer]

branch: elpa/proof-general
commit d9cfe74845e1f77017406e3327e7502f17bab063
Author: Erik Martin-Dorel 
Commit: GitHub 

docs: Improve MELPA doc (#642)

Close ProofGeneral/PG#641
---
 proof-general.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/proof-general.el b/proof-general.el
index 3dc15fa031..fc9853f67e 100644
--- a/proof-general.el
+++ b/proof-general.el
@@ -1,4 +1,4 @@
-;;; proof-general.el --- PG init file for package.el and ELPA compatibility 
-*- lexical-binding: t; -*-
+;;; proof-general.el --- A generic Emacs interface for proof assistants -*- 
lexical-binding: t; -*-
 
 ;; This file is part of Proof General.
 
@@ -28,12 +28,11 @@
 ;; along with this program.  If not, see .
 
 ;;; Commentary:
-;;
 ;; Proof General is a generic Emacs interface for proof assistants
 ;; (also known as interactive theorem provers).
 ;;
 ;; It is supplied ready to use for the proof assistants Coq,
-;; EasyCrypt, and PhoX.
+;; EasyCrypt, qrhl, and PhoX.
 ;;
 ;; See https://proofgeneral.github.io/ for installation instructions
 ;; and online documentation.  Or browse the accompanying info manual:

[nongnu] elpa/geiser e3b65ae29a: Version bump

[ELPA Syncer]

branch: elpa/geiser
commit e3b65ae29a78728cf4078f8a949217ec75204074
Author: jao 
Commit: jao 

Version bump
---
 elisp/geiser.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elisp/geiser.el b/elisp/geiser.el
index 342eb4aba3..a36f50ac6b 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -13,7 +13,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/
 ;; Package-Requires: ((emacs "25.1") (transient "0.3") (project "0.8.1"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.22.2
+;; Version: 0.23
 
 ;;; Commentary:
 

[nongnu] elpa/geiser 445175d8de: News update

[ELPA Syncer]

branch: elpa/geiser
commit 445175d8de1ae2b94d4a00843cdb75e07b782f9f
Author: jao 
Commit: jao 

News update
---
 news.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news.org b/news.org
index 61529ffca6..7aef4852b6 100644
--- a/news.org
+++ b/news.org
@@ -1,5 +1,5 @@
 
-* Version 0.23 (unreleased)
+* Version 0.23 (March, 2022)
 
   - Set REPL's default directory to project's root.
   - Depend on ELPA's project 0.8.1 to ensure compatibility

[nongnu] elpa/cider 1e27eba570: Use clojure-mode 5.14.0

[ELPA Syncer]

branch: elpa/cider
commit 1e27eba570d265bc27317dc2a8f8c98d8b5414e0
Author: vemv 
Commit: Bozhidar Batsov 

Use clojure-mode 5.14.0
---
 CHANGELOG.md | 4 
 cider.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f378918ab6..a245d345c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Changes
+
+* Use clojure-mode 
[5.14.0](https://github.com/clojure-emacs/clojure-mode/blob/v5.14.0/CHANGELOG.md#5140-2022-03-07).
+
 ## 1.3.0 (2021-03-07)
 
 ### New features
diff --git a/cider.el b/cider.el
index 79bb2e94ab..2afa9c38c1 100644
--- a/cider.el
+++ b/cider.el
@@ -12,7 +12,7 @@
 ;; Maintainer: Bozhidar Batsov 
 ;; URL: http://www.github.com/clojure-emacs/cider
 ;; Version: 1.3.0
-;; Package-Requires: ((emacs "26") (clojure-mode "5.12") (parseedn "1.0.6") 
(queue "0.2") (spinner "1.7") (seq "2.22") (sesman "0.3.2"))
+;; Package-Requires: ((emacs "26") (clojure-mode "5.14") (parseedn "1.0.6") 
(queue "0.2") (spinner "1.7") (seq "2.22") (sesman "0.3.2"))
 ;; Keywords: languages, clojure, cider
 
 ;; This program is free software: you can redistribute it and/or modify