[elpa] externals-release/activities 29587db34e 091/103: Merge: Improve completion defaults

[ELPA Syncer]

branch: externals-release/activities
commit 29587db34e66b0effe75d9b29810604a55aa9d8d
Merge: 70f75f1d2a 6938717945
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: Improve completion defaults
---
 README.org      |  1 +
 activities.el   | 21 ++++++++++++++-------
 activities.info | 10 ++++++----
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/README.org b/README.org
index 7c0bf6f176..cd5aea2962 100644
--- a/README.org
+++ b/README.org
@@ -120,6 +120,7 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 
 *Additions*
 + Offer current ~project~ name by default for new activities.  (Thanks to 
[[https://github.com/josephmturner][Joseph Turner]].)
++ Use current activity as default for various completions.  (Thanks to 
[[https://github.com/josephmturner][Joseph Turner]].)
 
 ** v0.1.3
 
diff --git a/activities.el b/activities.el
index a39af27652..f89693bfe5 100644
--- a/activities.el
+++ b/activities.el
@@ -312,9 +312,12 @@ Interactively, offers active activities."
 
 (defun activities-suspend (activity)
   "Suspend ACTIVITY.
-Its last is saved, and its frames, windows, and tabs are
-closed."
-  (interactive (list (activities-completing-read :prompt "Suspend activity: 
")))
+Its last is saved, and its frames, windows, and tabs are closed."
+  (interactive
+   (let ((default (when (activities-current)
+                    (activities-activity-name (activities-current)))))
+     (list (activities-completing-read :prompt (format-prompt "Suspend 
activity" default)
+                                       :default default))))
   (activities-save activity :lastp t)
   (activities-close activity))
 
@@ -339,7 +342,11 @@ In order to be safe for `kill-emacs-hook', this demotes 
errors."
   "Discard ACTIVITY and its state.
 It will not be recoverable."
   ;; TODO: Discard relevant bookmarks when `activities-bookmark-store' is 
enabled.
-  (interactive (list (activities-completing-read :prompt "Discard activity: 
")))
+  (interactive
+   (let ((default (when (activities-current)
+                    (activities-activity-name (activities-current)))))
+     (list (activities-completing-read :prompt (format-prompt "Discard 
activity" default)
+                                       :default default))))
   (ignore-errors
     ;; FIXME: After fixing all the bugs, remove ignore-errors.
     (activities-close activity))
@@ -633,11 +640,11 @@ activity's name is NAME."
           (current-buffer)))))
 
 (cl-defun activities-completing-read
-    (&key (activities activities-activities) (prompt "Open activity: "))
+    (&key (activities activities-activities) (prompt "Open activity: ") 
default)
   "Return an activity read with completion from ACTIVITIES.
-PROMPT is passed to `completing-read', which see."
+PROMPT and DEFAULT are passed to `completing-read', which see."
   (let* ((names (activities-names activities))
-         (name (completing-read prompt names nil t nil 
'activities-completing-read-history)))
+         (name (completing-read prompt names nil t nil 
'activities-completing-read-history default)))
     (or (map-elt activities-activities name)
         (make-activities-activity :name name))))
 
diff --git a/activities.info b/activities.info
index 3bf7cf6e54..a9e23a85a7 100644
--- a/activities.info
+++ b/activities.info
@@ -322,6 +322,8 @@ File: README.info,  Node: v02-pre,  Next: v013,  Up: 
Changelog
 *Additions*
    • Offer current ‘project’ name by default for new activities.
      (Thanks to Joseph Turner (https://github.com/josephmturner).)
+   • Use current activity as default for various completions.  (Thanks
+     to Joseph Turner (https://github.com/josephmturner).)
 
 
 File: README.info,  Node: v013,  Next: v012,  Prev: v02-pre,  Up: Changelog
@@ -374,10 +376,10 @@ Node: Bookmarks8288
 Node: FAQ8640
 Node: Changelog11716
 Node: v02-pre11894
-Node: v01312138
-Node: v01212291
-Node: v01112468
-Node: v0112631
+Node: v01312270
+Node: v01212423
+Node: v01112600
+Node: v0112763
 
 End Tag Table