[elpa] externals-release/activities d6d568f70e 071/103: Merge: v0.1.2

[ELPA Syncer]

branch: externals-release/activities
commit d6d568f70e391dc0de848a2b97ae9365f9fdd923
Merge: 6590d88558 89d375c10e
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Merge: v0.1.2
---
 README.org      |  5 +++++
 activities.el   |  7 ++++++-
 activities.info | 46 +++++++++++++++++++++++++++++-----------------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/README.org b/README.org
index a8c181cbe2..1884948545 100644
--- a/README.org
+++ b/README.org
@@ -120,6 +120,11 @@ When option ~activities-bookmark-store~ is enabled, an 
Emacs bookmark is stored
 
 Nothing new yet.
 
+** v0.1.2
+
+*Fixes*
++ Some single-window configurations were not restored properly.
+
 ** v0.1.1
 
 *Fixes*
diff --git a/activities.el b/activities.el
index 5300eb3cef..ad2f34fedd 100644
--- a/activities.el
+++ b/activities.el
@@ -494,7 +494,12 @@ activity's name is NAME."
                             (funcall serialize (map-elt parameters 
parameter)))))
                   (setf (map-elt attrs 'parameters) parameters)
                   (cons 'leaf attrs))))
-    (translate-state state)))
+    (if-let ((leaf-pos (cl-position 'leaf state)))
+        ;; A one-window frame: the elements following `leaf' are that window's 
params.
+        (append (cl-subseq state 0 leaf-pos)
+                (translate-leaf (cl-subseq state leaf-pos)))
+      ;; Multi-window frame.
+      (translate-state state))))
 
 (defun activities--windows-set (state)
   "Set window configuration according to STATE."
diff --git a/activities.info b/activities.info
index e60338ad75..25a2010965 100644
--- a/activities.info
+++ b/activities.info
@@ -61,6 +61,7 @@ Usage
 Changelog
 
 * v0.2-pre: v02-pre.
+* v0.1.2: v012.
 * v0.1.1: v011.
 * v0.1: v01.
 
@@ -306,11 +307,12 @@ File: README.info,  Node: Changelog,  Prev: FAQ,  Up: Top
 * Menu:
 
 * v0.2-pre: v02-pre.
+* v0.1.2: v012.
 * v0.1.1: v011.
 * v0.1: v01.
 
 
-File: README.info,  Node: v02-pre,  Next: v011,  Up: Changelog
+File: README.info,  Node: v02-pre,  Next: v012,  Up: Changelog
 
 4.1 v0.2-pre
 ============
@@ -318,9 +320,18 @@ File: README.info,  Node: v02-pre,  Next: v011,  Up: 
Changelog
 Nothing new yet.
 
 
-File: README.info,  Node: v011,  Next: v01,  Prev: v02-pre,  Up: Changelog
+File: README.info,  Node: v012,  Next: v011,  Prev: v02-pre,  Up: Changelog
 
-4.2 v0.1.1
+4.2 v0.1.2
+==========
+
+*Fixes*
+   • Some single-window configurations were not restored properly.
+
+
+File: README.info,  Node: v011,  Next: v01,  Prev: v012,  Up: Changelog
+
+4.3 v0.1.1
 ==========
 
 *Fixes*
@@ -329,7 +340,7 @@ File: README.info,  Node: v011,  Next: v01,  Prev: v02-pre, 
 Up: Changelog
 
 File: README.info,  Node: v01,  Prev: v011,  Up: Changelog
 
-4.3 v0.1
+4.4 v0.1
 ========
 
 Initial release.
@@ -338,19 +349,20 @@ Initial release.
 
 Tag Table:
 Node: Top231
-Node: Installation2135
-Node: Usage3764
-Node: Activities3952
-Node: Compatibility4940
-Node: Modes5424
-Node: Workflow6092
-Node: Commands7045
-Node: Bookmarks8258
-Node: FAQ8610
-Node: Changelog11686
-Node: v02-pre11832
-Node: v01111943
-Node: v0112109
+Node: Installation2151
+Node: Usage3780
+Node: Activities3968
+Node: Compatibility4956
+Node: Modes5440
+Node: Workflow6108
+Node: Commands7061
+Node: Bookmarks8274
+Node: FAQ8626
+Node: Changelog11702
+Node: v02-pre11864
+Node: v01211975
+Node: v01112155
+Node: v0112318
 
 End Tag Table