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

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

[elpa] externals/activities 59caef88e6: Merge: v0.7.2


From: ELPA Syncer
Subject: [elpa] externals/activities 59caef88e6: Merge: v0.7.2
Date: Mon, 16 Dec 2024 21:57:35 -0500 (EST)

branch: externals/activities
commit 59caef88e621913c8fb26aeb33eb1da05c9f319b
Merge: a341ae21c4 a7e7842c61
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: v0.7.2
---
 README.org    | 5 +++++
 activities.el | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 8e28aada66..57251605e7 100644
--- a/README.org
+++ b/README.org
@@ -155,6 +155,11 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 
 Nothing new yet.
 
+** v0.7.2
+
+*Fixes*
++ Handle errors from window parameter deserializers.  
([[https://github.com/alphapapa/activities.el/issues/44][#44]].  Thanks to 
[[https://github.com/karthink][Karthik Chikmagalur]] and 
[[https://github.com/stardiviner][stardiviner]] for reporting.)
+
 ** v0.7.1
 
 *Fixes*
diff --git a/activities.el b/activities.el
index 9e2279c335..8f34aebadf 100644
--- a/activities.el
+++ b/activities.el
@@ -675,9 +675,11 @@ activity's name is NAME."
                              ((map parameters) attrs))
                   (pcase-dolist (`(,parameter . ,(map deserialize))
                                  activities-window-parameters-translators)
-                    (when (map-elt parameters parameter)
-                      (setf (map-elt parameters parameter)
-                            (funcall deserialize (map-elt parameters 
parameter)))))
+                    (condition-case-unless-debug nil
+                        (when (map-elt parameters parameter)
+                          (setf (map-elt parameters parameter)
+                                (funcall deserialize (map-elt parameters 
parameter))))
+                      (error (setf parameters (map-delete parameters 
parameter)))))
                   (setf (map-elt attrs 'parameters) parameters)
                   (cons 'leaf attrs))))
     (if-let ((leaf-pos (cl-position 'leaf state)))



reply via email to

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