[elpa] externals-release/activities 10783f474f 012/103: WIP

[ELPA Syncer]

branch: externals-release/activities
commit 10783f474f2eb3326efc8ea071d1dd76d32bda9a
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    WIP
---
 activity-tabs.el |  6 ++++--
 activity.el      | 11 ++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/activity-tabs.el b/activity-tabs.el
index 5492ee97bc..b9cb52c3b9 100644
--- a/activity-tabs.el
+++ b/activity-tabs.el
@@ -57,18 +57,20 @@ accordingly."
   :group 'activity
   (if activity-tabs-mode
       (progn
+        (tab-bar-mode 1)
         (advice-add #'activity-resume :before #'activity-tabs-before-resume))
     (advice-remove #'activity-resume #'activity-tabs-before-resume)))
 
 ;;;; Functions
 
-(defun activity-tabs-before-resume (activity)
+(defun activity-tabs-before-resume (activity &rest _)
   "Called before resuming ACTIVITY."
-  (run-hook-with-args activity-tabs-before-resume-functions activity))
+  (run-hook-with-args 'activity-tabs-before-resume-functions activity))
 
 (defun activity-tabs-switch-to-tab (activity)
   "Switch to a tab for ACTIVITY."
   (pcase-let* (((cl-struct activity name) activity)
+               (name (string-remove-prefix activity-bookmark-prefix name))
                (tab-name (concat activity-tabs-prefix name)))
     (tab-bar-switch-to-tab tab-name)))
 
diff --git a/activity.el b/activity.el
index 371c3f7491..37fdfc7f25 100644
--- a/activity.el
+++ b/activity.el
@@ -219,12 +219,9 @@ closed."
   (activity-save activity :lastp t)
   (activity-close activity))
 
-(cl-defmethod activity-open (activity &context (activity-tabs-mode (eql nil))
-                                      &key (state 'last))
+(cl-defun activity-open (activity &key (state 'last))
   "Open ACTIVITY.
-Its STATE is loaded into the current frame.  Used when
-ACTIVITY-TABS-MODE is inactive."
-  ;; TODO: Use a hook to optionally open a new frame.
+Its STATE is loaded into the current frame."
   (pcase-let (((cl-struct activity name default last) activity))
     (pcase state
       ('default (activity--windows-set (activity-state-window-state default)))
@@ -233,10 +230,10 @@ ACTIVITY-TABS-MODE is inactive."
                (activity--windows-set (activity-state-window-state default))
                (message "Activity %S has no last state.  Resuming default." 
name))))))
 
-(cl-defmethod activity-close (activity &context (activity-tabs-mode (eql nil)))
+(cl-defun activity-close (activity)
   "Close ACTIVITY.
 Its state is not saved, and its frames, windows, and tabs are
-closed.  Used when ACTIVITY-TABS-MODE is inactive."
+closed."
   (pcase-let* (((cl-struct activity name) activity)
                (frame (cl-find-if
                        (lambda (frame)