[elpa] externals-release/activities dc2bf71050 085/103: Merge: (activities-default-name-fn)

[ELPA Syncer]

branch: externals-release/activities
commit dc2bf710501caa72aee64f86d6e9f96501e47e1f
Merge: 7fb531c494 8afee346ab
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: (activities-default-name-fn)
---
 README.org      |  3 ++-
 activities.el   | 21 ++++++++++++++++++++-
 activities.info | 12 +++++++-----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/README.org b/README.org
index 5621688e1f..7c0bf6f176 100644
--- a/README.org
+++ b/README.org
@@ -118,7 +118,8 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 
 ** v0.2-pre
 
-Nothing new yet.
+*Additions*
++ Offer current ~project~ name by default for new activities.  (Thanks to 
[[https://github.com/josephmturner][Joseph Turner]].)
 
 ** v0.1.3
 
diff --git a/activities.el b/activities.el
index d61bdaa7a7..97d93e5ab0 100644
--- a/activities.el
+++ b/activities.el
@@ -260,6 +260,14 @@ Called with one argument, the activity."
 Called with one argument, the activity."
   :type 'hook)
 
+(defcustom activities-default-name-fn 'activities--project-name
+  "Function that returns the default name for a new activity.
+The string should not be prefixed by, e.g. \"Activity\" because
+prefixes will be added automatically."
+  :type '(choice (const :tag "No default name" (lambda (&rest _) nil))
+                 (const :tag "Current project's name" activities--project-name)
+                 (function-item :tag "Other function")))
+
 ;;;; Commands
 
 ;;;###autoload
@@ -268,7 +276,9 @@ Called with one argument, the activity."
 If FORCEP (interactively, with prefix), overwrite existing
 activity."
   (interactive
-   (list (read-string "New activity name: ") :forcep current-prefix-arg))
+   (let ((default (funcall activities-default-name-fn)))
+     (list (read-string (format-prompt "New activity name" default) nil nil 
default)
+           :forcep current-prefix-arg)))
   (when (and (not forcep) (member name (activities-names)))
     (user-error "Activity named %S already exists" name))
   (let ((activity (make-activities-activity :name name)))
@@ -640,6 +650,15 @@ PROMPT is passed to `completing-read', which see."
 Adds `activities-name-prefix'."
   (concat activities-name-prefix (activities-activity-name activity)))
 
+;;;; Project support
+
+(declare-function project-name "project")
+(defun activities--project-name ()
+  "Return the name of the current project, if any."
+  (require 'project)
+  (when-let ((project (project-current)))
+    (project-name project)))
+
 ;;;; Bookmark support
 
 (defun activities-bookmark-store (activity)
diff --git a/activities.info b/activities.info
index 17f3b3fd12..3bf7cf6e54 100644
--- a/activities.info
+++ b/activities.info
@@ -319,7 +319,9 @@ File: README.info,  Node: v02-pre,  Next: v013,  Up: 
Changelog
 4.1 v0.2-pre
 ============
 
-Nothing new yet.
+*Additions*
+   • Offer current ‘project’ name by default for new activities.
+     (Thanks to Joseph Turner (https://github.com/josephmturner).)
 
 
 File: README.info,  Node: v013,  Next: v012,  Prev: v02-pre,  Up: Changelog
@@ -372,10 +374,10 @@ Node: Bookmarks8288
 Node: FAQ8640
 Node: Changelog11716
 Node: v02-pre11894
-Node: v01312005
-Node: v01212158
-Node: v01112335
-Node: v0112498
+Node: v01312138
+Node: v01212291
+Node: v01112468
+Node: v0112631
 
 End Tag Table