[elpa] externals-release/activities 379058b3cf 061/103: Tidy

[ELPA Syncer]

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

    Tidy
---
 activities.el | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/activities.el b/activities.el
index b3e7847806..0e6ef768ff 100644
--- a/activities.el
+++ b/activities.el
@@ -290,6 +290,15 @@ available."
     (unless (or resetp already-active-p)
       (activities-set activity :state (if resetp 'default 'last)))))
 
+(defun activities-switch (activity)
+  "Switch to ACTIVITY.
+Interactively, offers active activities."
+  (interactive
+   (list (activities-completing-read
+          :activities (cl-remove-if-not #'activities-activity-active-p 
activities-activities :key #'cdr)
+          :prompt "Switch to: ")))
+  (activities--switch activity))
+
 (defun activities-suspend (activity)
   "Suspend ACTIVITY.
 Its last is saved, and its frames, windows, and tabs are
@@ -298,20 +307,7 @@ closed."
   (activities-save activity :lastp t)
   (activities-close activity))
 
-(cl-defun activities-save (activity &key defaultp lastp persistp)
-  "Save states of ACTIVITY.
-If DEFAULTP, save its default state; if LASTP, its last.  If
-PERSISTP, force persisting of data (otherwise, data is persisted
-according to option `activities-always-persist', which see)."
-  (unless (or defaultp lastp)
-    (user-error "Neither DEFAULTP nor LASTP specified"))
-  (activities-with activity
-    (pcase-let* (((cl-struct activities-activity name default last) activity)
-                 (new-state (activities-state)))
-      (setf (activities-activity-default activity) (if (or defaultp (not 
default)) new-state default)
-            (activities-activity-last activity) (if (or lastp (not last)) 
new-state last)
-            (map-elt activities-activities name) activity)))
-  (activities--persist persistp))
+(defalias #'activities-suspend 'activities-kill)
 
 (defun activities-save-all ()
   "Save all active activities' last states.
@@ -321,15 +317,13 @@ In order to be safe for `kill-emacs-hook', this demotes 
errors."
     (dolist (activity (cl-remove-if-not #'activities-activity-active-p 
(map-values activities-activities)))
       (activities-save activity :lastp t))))
 
-(defun activities-reset (activity)
+(defun activities-revert (activity)
   "Reset ACTIVITY to its default state."
   (interactive (list (activities-current)))
   (unless activity
     (user-error "No active activity"))
   (activities-set activity :state 'default))
 
-(defalias 'activities-revert #'activities-reset)
-
 (defun activities-discard (activity)
   "Discard ACTIVITY and its state.
 It will not be recoverable."
@@ -379,6 +373,21 @@ To be called from `kill-emacs-hook'."
 
 ;;;; Functions
 
+(cl-defun activities-save (activity &key defaultp lastp persistp)
+  "Save states of ACTIVITY.
+If DEFAULTP, save its default state; if LASTP, its last.  If
+PERSISTP, force persisting of data (otherwise, data is persisted
+according to option `activities-always-persist', which see)."
+  (unless (or defaultp lastp)
+    (user-error "Neither DEFAULTP nor LASTP specified"))
+  (activities-with activity
+    (pcase-let* (((cl-struct activities-activity name default last) activity)
+                 (new-state (activities-state)))
+      (setf (activities-activity-default activity) (if (or defaultp (not 
default)) new-state default)
+            (activities-activity-last activity) (if (or lastp (not last)) 
new-state last)
+            (map-elt activities-activities name) activity)))
+  (activities--persist persistp))
+
 (cl-defun activities-set (activity &key (state 'last))
   "Set ACTIVITY as the current one.
 Its STATE (`last' or `default') is loaded into the current frame."
@@ -418,15 +427,6 @@ closed."
   "Return activity having NAME."
   (map-elt activities-activities name))
 
-(defun activities-switch (activity)
-  "Switch to ACTIVITY.
-Interactively, offers active activities."
-  (interactive
-   (list (activities-completing-read
-          :activities (cl-remove-if-not #'activities-activity-active-p 
activities-activities :key #'cdr)
-          :prompt "Switch to: ")))
-  (activities--switch activity))
-
 (defun activities--switch (activity)
   "Switch to ACTIVITY.
 Select's ACTIVITY's frame, making a new one if needed.  Its state