[elpa] externals/activities c7258e3551: Fix: (activities-discard) Don't switch to inactive activities

[ELPA Syncer]

branch: externals/activities
commit c7258e3551be75bacaf88bf4914db8916c1ed33e
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Fix: (activities-discard) Don't switch to inactive activities
    
    Fixes #18.
    
    Reported-by: J.D. Smith <jdtsmith@gmail.com>
---
 README.org      |  1 +
 activities.el   | 10 ++++++----
 activities.info | 27 +++++++++++++++------------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/README.org b/README.org
index a468f1127f..78d2f4845a 100644
--- a/README.org
+++ b/README.org
@@ -150,6 +150,7 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 *Fixes*
 + Show a helpful error if a bookmark's target file is missing.  
([[https://github.com/alphapapa/activities.el/issues/17][#17]].  Thanks to 
[[https://github.com/jdtsmith][JD Smith]] for reporting.)
 + Sort order in ~activities-list~.
++ When discarding an inactive activity, don't switch to it first.  
([[https://github.com/alphapapa/activity.el/issues/18][#18]].  Thanks to 
[[https://github.com/jdtsmith][JD Smith]] for reporting.)
 
 ** v0.4
 
diff --git a/activities.el b/activities.el
index 0ccf325541..ff507dddf2 100644
--- a/activities.el
+++ b/activities.el
@@ -377,10 +377,12 @@ It will not be recoverable."
   ;; TODO: Discard relevant bookmarks when `activities-bookmark-store' is 
enabled.
   (interactive
    (list (activities-completing-read :prompt "Discard activity")))
-  (ignore-errors
-    ;; FIXME: After fixing all the bugs, remove ignore-errors.
-    (activities-close activity))
-  (setf activities-activities (map-delete activities-activities 
(activities-activity-name activity))))
+  (when (yes-or-no-p (format "Discard activity %S permanently?" 
(activities-activity-name activity)))
+    (ignore-errors
+      ;; FIXME: After fixing all the bugs, remove ignore-errors.
+      (when (activities-activity-active-p activity)
+        (activities-close activity)))
+    (setf activities-activities (map-delete activities-activities 
(activities-activity-name activity)))))
 
 ;;;; Activity mode
 
diff --git a/activities.info b/activities.info
index 1a01cb0279..d0d640008c 100644
--- a/activities.info
+++ b/activities.info
@@ -414,6 +414,9 @@ File: README.info,  Node: v05-pre,  Next: v04,  Up: 
Changelog
      (https://github.com/alphapapa/activities.el/issues/17).  Thanks to
      JD Smith (https://github.com/jdtsmith) for reporting.)
    • Sort order in ‘activities-list’.
+   • When discarding an inactive activity, don’t switch to it first.
+     (#18 (https://github.com/alphapapa/activity.el/issues/18).  Thanks
+     to JD Smith (https://github.com/jdtsmith) for reporting.)
 
 
 File: README.info,  Node: v04,  Next: v033,  Prev: v05-pre,  Up: Changelog
@@ -578,18 +581,18 @@ Node: Bookmarks10053
 Node: FAQ10405
 Node: Changelog13481
 Node: v05-pre13766
-Node: v0414782
-Node: v03315327
-Node: v03215757
-Node: v03115885
-Node: v0316215
-Node: v0216605
-Node: v01317097
-Node: v01217246
-Node: v01117423
-Node: v0117588
-Node: Development17689
-Node: Copyright assignment17961
+Node: v0414990
+Node: v03315535
+Node: v03215965
+Node: v03116093
+Node: v0316423
+Node: v0216813
+Node: v01317305
+Node: v01217454
+Node: v01117631
+Node: v0117796
+Node: Development17897
+Node: Copyright assignment18169
 
 End Tag Table