[elpa] externals/activities c7bd5c5af6 2/3: Merge: v0.3.1

[ELPA Syncer]

branch: externals/activities
commit c7bd5c5af6848c6581f0a97c4de1b1f852536b7c
Merge: 1a19cc5ac8 5e0bfba601
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: v0.3.1
---
 README.org         |  5 +++++
 activities-tabs.el | 16 ++++++++++----
 activities.info    | 65 +++++++++++++++++++++++++++++++++---------------------
 3 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/README.org b/README.org
index 9f833a24c1..7d12334207 100644
--- a/README.org
+++ b/README.org
@@ -122,6 +122,11 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 
 Nothing new yet.
 
+** v0.3.1
+
+*Fixes*
++ Handle case in which ~activities-tabs-mode~ is enabled again without having 
been disabled (which caused an error in ~tab-bar-mode~). 
([[https://github.com/alphapapa/activities.el/issues/7][#7]])
+
 ** v0.3
 
 *Additions*
diff --git a/activities-tabs.el b/activities-tabs.el
index 98333a78ff..10ee0abecd 100644
--- a/activities-tabs.el
+++ b/activities-tabs.el
@@ -76,13 +76,21 @@ accordingly."
           (advice-add #'activities-resume :before 
#'activities-tabs-before-resume)
           (pcase-dolist (`(,symbol . ,function) override-map)
             (advice-add symbol :override function))
-          (setf activities-tabs-tab-bar-tab-face-function-original 
tab-bar-tab-face-function
-                tab-bar-tab-face-function 
#'activities-tabs--tab-bar-tab-face-function))
+          ;; The mode command could be called to activate the mode
+          ;; when it already is, in which case we must not swap the
+          ;; tab-face-function again, which would discard the actual,
+          ;; original value.  (IOW, this must be idempotent.)
+          ;; TODO: A way to prevent modes' body forms from being
+          ;; reevaluated when they are already active.
+          (unless activities-tabs-tab-bar-tab-face-function-original
+            (setf activities-tabs-tab-bar-tab-face-function-original 
tab-bar-tab-face-function
+                  tab-bar-tab-face-function 
#'activities-tabs--tab-bar-tab-face-function)))
       (advice-remove #'activities-resume #'activities-tabs-before-resume)
       (pcase-dolist (`(,symbol . ,function) override-map)
         (advice-remove symbol function))
-      (setf tab-bar-tab-face-function 
activities-tabs-tab-bar-tab-face-function-original
-            activities-tabs-tab-bar-tab-face-function-original nil))))
+      (when activities-tabs-tab-bar-tab-face-function-original
+        (setf tab-bar-tab-face-function 
activities-tabs-tab-bar-tab-face-function-original
+              activities-tabs-tab-bar-tab-face-function-original nil)))))
 
 ;;;; Functions
 
diff --git a/activities.info b/activities.info
index 8ca013a480..8c492a84cb 100644
--- a/activities.info
+++ b/activities.info
@@ -61,6 +61,7 @@ Usage
 Changelog
 
 * v0.4-pre: v04-pre.
+* v0.3.1: v031.
 * v0.3: v03.
 * v0.2: v02.
 * v0.1.3: v013.
@@ -314,6 +315,7 @@ File: README.info,  Node: Changelog,  Prev: FAQ,  Up: Top
 * Menu:
 
 * v0.4-pre: v04-pre.
+* v0.3.1: v031.
 * v0.3: v03.
 * v0.2: v02.
 * v0.1.3: v013.
@@ -322,7 +324,7 @@ File: README.info,  Node: Changelog,  Prev: FAQ,  Up: Top
 * v0.1: v01.
 
 
-File: README.info,  Node: v04-pre,  Next: v03,  Up: Changelog
+File: README.info,  Node: v04-pre,  Next: v031,  Up: Changelog
 
 4.1 v0.4-pre
 ============
@@ -330,9 +332,21 @@ File: README.info,  Node: v04-pre,  Next: v03,  Up: 
Changelog
 Nothing new yet.
 
 
-File: README.info,  Node: v03,  Next: v02,  Prev: v04-pre,  Up: Changelog
+File: README.info,  Node: v031,  Next: v03,  Prev: v04-pre,  Up: Changelog
 
-4.2 v0.3
+4.2 v0.3.1
+==========
+
+*Fixes*
+   • Handle case in which ‘activities-tabs-mode’ is enabled again
+     without having been disabled (which caused an error in
+     ‘tab-bar-mode’).  (#7
+     (https://github.com/alphapapa/activities.el/issues/7))
+
+
+File: README.info,  Node: v03,  Next: v02,  Prev: v031,  Up: Changelog
+
+4.3 v0.3
 ========
 
 *Additions*
@@ -345,7 +359,7 @@ File: README.info,  Node: v03,  Next: v02,  Prev: v04-pre,  
Up: Changelog
 
 File: README.info,  Node: v02,  Next: v013,  Prev: v03,  Up: Changelog
 
-4.3 v0.2
+4.4 v0.2
 ========
 
 *Additions*
@@ -361,7 +375,7 @@ File: README.info,  Node: v02,  Next: v013,  Prev: v03,  
Up: Changelog
 
 File: README.info,  Node: v013,  Next: v012,  Prev: v02,  Up: Changelog
 
-4.4 v0.1.3
+4.5 v0.1.3
 ==========
 
 *Fixes*
@@ -371,7 +385,7 @@ File: README.info,  Node: v013,  Next: v012,  Prev: v02,  
Up: Changelog
 
 File: README.info,  Node: v012,  Next: v011,  Prev: v013,  Up: Changelog
 
-4.5 v0.1.2
+4.6 v0.1.2
 ==========
 
 *Fixes*
@@ -380,7 +394,7 @@ File: README.info,  Node: v012,  Next: v011,  Prev: v013,  
Up: Changelog
 
 File: README.info,  Node: v011,  Next: v01,  Prev: v012,  Up: Changelog
 
-4.6 v0.1.1
+4.7 v0.1.1
 ==========
 
 *Fixes*
@@ -389,7 +403,7 @@ File: README.info,  Node: v011,  Next: v01,  Prev: v012,  
Up: Changelog
 
 File: README.info,  Node: v01,  Prev: v011,  Up: Changelog
 
-4.7 v0.1
+4.8 v0.1
 ========
 
 Initial release.
@@ -398,23 +412,24 @@ Initial release.
 
 Tag Table:
 Node: Top231
-Node: Installation2193
-Node: Usage3860
-Node: Activities4048
-Node: Compatibility5036
-Node: Modes5520
-Node: Workflow6188
-Node: Commands7141
-Node: Bookmarks8497
-Node: FAQ8849
-Node: Changelog11925
-Node: v04-pre12129
-Node: v0312239
-Node: v0212632
-Node: v01313124
-Node: v01213273
-Node: v01113450
-Node: v0113613
+Node: Installation2209
+Node: Usage3876
+Node: Activities4064
+Node: Compatibility5052
+Node: Modes5536
+Node: Workflow6204
+Node: Commands7157
+Node: Bookmarks8513
+Node: FAQ8865
+Node: Changelog11941
+Node: v04-pre12161
+Node: v03112272
+Node: v0312605
+Node: v0212995
+Node: v01313487
+Node: v01213636
+Node: v01113813
+Node: v0113976
 
 End Tag Table