From 95f8c07d7fbd8e45b244e3d5d9d381fb58ea411a Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 00:31:53 +0100
Subject: [PATCH 01/17] lazy sessions

---
 qutebrowser/browser/qutescheme.py |  7 +++++++
 qutebrowser/config/configdata.yml |  8 ++++++++
 qutebrowser/misc/sessions.py      | 17 ++++++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 11dcfe004..f943fcba4 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -424,6 +424,13 @@ def qute_settings(url):
                         confget=config.instance.get_str)
     return 'text/html', html
 
+@add_handler('back')
+def qute_back(url):
+    """Handler for qute://back. Simple page to free ram / lazy load a site,
+    goes back on focusing the tab."""
+
+    html = jinja.render('back.html', title='Suspended')
+    return 'text/html', html
 
 @add_handler('configdiff')
 def qute_configdiff(url):
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index ba8c36857..7284d98d5 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -88,6 +88,14 @@ session_default_name:
 
     If this is set to null, the session which was last loaded is saved.
 
+session_lazy_restore:
+  type:
+    name: Bool
+    none_ok: true
+  default: false
+  desc: >-
+    Load a restored tab as soon as it takes focus.
+
 backend:
   type:
     name: String
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 064d8c9e9..471805da9 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -347,7 +347,9 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
-            active = histentry.get('active', False)
+            active = (histentry.get('active', False) and
+                     (not config.val.session_lazy_restore or
+                      histentry['url'].startswith('qute://')))
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:
                 orig_url = QUrl.fromEncoded(
@@ -360,6 +362,19 @@ class SessionManager(QObject):
             entries.append(entry)
             if active:
                 new_tab.title_changed.emit(histentry['title'])
+
+        if config.val.session_lazy_restore and data['history']:
+            last = data['history'][-1]
+            title = last['title']
+            url = 'qute://back#' + title
+            active = last.get('active', False)
+
+            if not last['url'].startswith('qute://'):
+                entries.append(TabHistoryItem(url=QUrl.fromEncoded(url.encode('ascii')),
+                                              title=title, active=active, user_data={}))
+                if active:
+                    new_tab.title_changed.emit(title)
+
         try:
             new_tab.history.load_items(entries)
         except ValueError as e:

From ade7004f8f4429affc27a8f5b03ad783ca994ca9 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 00:48:31 +0100
Subject: [PATCH 02/17] lazy sessions

---
 qutebrowser/browser/qutescheme.py |  2 ++
 qutebrowser/misc/sessions.py      | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index f943fcba4..3881a0d2e 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -424,6 +424,7 @@ def qute_settings(url):
                         confget=config.instance.get_str)
     return 'text/html', html
 
+
 @add_handler('back')
 def qute_back(url):
     """Handler for qute://back. Simple page to free ram / lazy load a site,
@@ -432,6 +433,7 @@ def qute_back(url):
     html = jinja.render('back.html', title='Suspended')
     return 'text/html', html
 
+
 @add_handler('configdiff')
 def qute_configdiff(url):
     """Handler for qute://configdiff."""
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 471805da9..4784f796a 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -348,8 +348,8 @@ class SessionManager(QObject):
                 new_tab.data.pinned = histentry['pinned']
 
             active = (histentry.get('active', False) and
-                     (not config.val.session_lazy_restore or
-                      histentry['url'].startswith('qute://')))
+                        (not config.val.session_lazy_restore or
+                        histentry['url'].startswith('qute://')))
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:
                 orig_url = QUrl.fromEncoded(
@@ -370,8 +370,10 @@ class SessionManager(QObject):
             active = last.get('active', False)
 
             if not last['url'].startswith('qute://'):
-                entries.append(TabHistoryItem(url=QUrl.fromEncoded(url.encode('ascii')),
-                                              title=title, active=active, user_data={}))
+                entries.append(TabHistoryItem(
+                    url=QUrl.fromEncoded(url.encode('ascii')),
+                    title=title, active=active, user_data={}))
+
                 if active:
                     new_tab.title_changed.emit(title)
 

From 51dea053f459c7cd0977c75047ff41a2f3ca1060 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 01:00:16 +0100
Subject: [PATCH 03/17] lazy sessions

---
 qutebrowser/html/back.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 qutebrowser/html/back.html

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
new file mode 100644
index 000000000..8a21f3d80
--- /dev/null
+++ b/qutebrowser/html/back.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block script %}
+window.onload = function() {
+	var title = 'Suspended: ' + document.location.hash.substr(1);
+	var node = document.getElementsByTagName('h1')[0];
+	node.innerText = document.title = title;
+};
+window.onfocus = function() {
+	window.history.back();
+};
+{% endblock %}
+
+{% block content %}
+<noscript><h1 class="noscript">View Only</h1><p class="noscript-text">Changing settings requires javascript to be enabled!</p></noscript>
+<header><h1>{{ title }}</h1></header>
+
+{% endblock %}

From c4bb13431331b7c5aad5696f54998210c12a1f12 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 11:04:04 +0100
Subject: [PATCH 04/17] lazy sessions, improved version

---
 qutebrowser/misc/sessions.py | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 4784f796a..da49205df 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -323,6 +323,18 @@ class SessionManager(QObject):
     def _load_tab(self, new_tab, data):
         """Load yaml data into a newly opened tab."""
         entries = []
+
+        if config.val.session_lazy_restore and data['history']:
+            last = data['history'][-1]
+
+            if not last['url'].startswith('qute://'):
+                data['history'].append({
+                    'title': last['title'],
+                    'url': 'qute://back#' + last['title'],
+                    'active': last.get('active', False)
+                })
+                last['active'] = False
+
         for histentry in data['history']:
             user_data = {}
 
@@ -347,9 +359,7 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
-            active = (histentry.get('active', False) and
-                        (not config.val.session_lazy_restore or
-                        histentry['url'].startswith('qute://')))
+            active = histentry.get('active', False)
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:
                 orig_url = QUrl.fromEncoded(
@@ -363,20 +373,6 @@ class SessionManager(QObject):
             if active:
                 new_tab.title_changed.emit(histentry['title'])
 
-        if config.val.session_lazy_restore and data['history']:
-            last = data['history'][-1]
-            title = last['title']
-            url = 'qute://back#' + title
-            active = last.get('active', False)
-
-            if not last['url'].startswith('qute://'):
-                entries.append(TabHistoryItem(
-                    url=QUrl.fromEncoded(url.encode('ascii')),
-                    title=title, active=active, user_data={}))
-
-                if active:
-                    new_tab.title_changed.emit(title)
-
         try:
             new_tab.history.load_items(entries)
         except ValueError as e:

From c150c5481a093a14c42ef1233cc54214972bc381 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 13:46:50 +0100
Subject: [PATCH 05/17] lazy sessions, dont save qute://back

---
 qutebrowser/misc/sessions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index da49205df..807d4bde4 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -205,7 +205,11 @@ class SessionManager(QObject):
         for idx, item in enumerate(tab.history):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
-            data['history'].append(item_data)
+            if item_data['url'].startswith('qute://back'):
+                if 'active' in item_data and data['history']:
+                    data['history'][-1]['active'] = item_data.get('active', False)
+            else:
+                data['history'].append(item_data)
         return data
 
     def _save_all(self, *, only_window=None, with_private=False):

From 1a33c88c9607fdfd71b925699994981ce19a8827 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 13:47:57 +0100
Subject: [PATCH 06/17] lazy sessions, dont save qute://back

---
 qutebrowser/misc/sessions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 807d4bde4..1dc27397d 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -207,7 +207,8 @@ class SessionManager(QObject):
             item_data = self._save_tab_item(tab, idx, item)
             if item_data['url'].startswith('qute://back'):
                 if 'active' in item_data and data['history']:
-                    data['history'][-1]['active'] = item_data.get('active', False)
+                    data['history'][-1]['active'] = \
+                        item_data.get('active', False)
             else:
                 data['history'].append(item_data)
         return data

From 2debeafe1bd5ee7dfb0a88a57957554fd03934d2 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 13:51:30 +0100
Subject: [PATCH 07/17] lazy sessions, dont save qute://back

---
 qutebrowser/misc/sessions.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 1dc27397d..c44b2ed8b 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -206,9 +206,8 @@ class SessionManager(QObject):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
             if item_data['url'].startswith('qute://back'):
-                if 'active' in item_data and data['history']:
-                    data['history'][-1]['active'] = \
-                        item_data.get('active', False)
+                if item_data.get('active', False) and data['history']:
+                    data['history'][-1]['active'] = True
             else:
                 data['history'].append(item_data)
         return data

From cf8130bd225d4b4497f79d3ccd1d9a3226b7a6b8 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 14:12:37 +0100
Subject: [PATCH 08/17] lazy session, fix: active entry is not the end of the
 history

---
 qutebrowser/html/back.html   | 14 +++++++++++---
 qutebrowser/misc/sessions.py | 26 +++++++++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 8a21f3d80..c28419a64 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -6,9 +6,17 @@ window.onload = function() {
 	var node = document.getElementsByTagName('h1')[0];
 	node.innerText = document.title = title;
 };
-window.onfocus = function() {
-	window.history.back();
-};
+setTimeout(function() {
+	/* drop first focus event, to avoid problems
+	(allow to go easily to newer history entries) */
+	var triggered = false;
+	window.onfocus = function() {
+		if (! triggered) {
+			triggered = true;
+			window.history.back();
+		}
+	};
+}, 1000);
 {% endblock %}
 
 {% block content %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index c44b2ed8b..0e2b40c68 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -206,7 +206,9 @@ class SessionManager(QObject):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
             if item_data['url'].startswith('qute://back'):
+                # dont add qute://back to the session file
                 if item_data.get('active', False) and data['history']:
+                    # mark entry before qute://back as active
                     data['history'][-1]['active'] = True
             else:
                 data['history'].append(item_data)
@@ -331,15 +333,7 @@ class SessionManager(QObject):
         if config.val.session_lazy_restore and data['history']:
             last = data['history'][-1]
 
-            if not last['url'].startswith('qute://'):
-                data['history'].append({
-                    'title': last['title'],
-                    'url': 'qute://back#' + last['title'],
-                    'active': last.get('active', False)
-                })
-                last['active'] = False
-
-        for histentry in data['history']:
+        for i, histentry in enumerate(data['history']):
             user_data = {}
 
             if 'zoom' in data:
@@ -363,6 +357,20 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
+            if (config.val.session_lazy_restore and
+                    histentry.get('active', False) and
+                    not histentry['url'].startswith('qute://back')):
+                # remove "active" mark and insert back page marked as active
+                data['history'].insert(
+                    i + 1,
+                    {
+                        'title': histentry['title'],
+                        'url': 'qute://back#' + histentry['title'],
+                        'active': True
+                    })
+                histentry['active'] = False
+
+            print(histentry)
             active = histentry.get('active', False)
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:

From 13dc24f6cafe297b570b60d1ca28ae4f6a76d3c4 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 14:31:55 +0100
Subject: [PATCH 09/17] debug code removed

---
 qutebrowser/misc/sessions.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 0e2b40c68..c3634a64a 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -330,9 +330,6 @@ class SessionManager(QObject):
         """Load yaml data into a newly opened tab."""
         entries = []
 
-        if config.val.session_lazy_restore and data['history']:
-            last = data['history'][-1]
-
         for i, histentry in enumerate(data['history']):
             user_data = {}
 
@@ -370,7 +367,6 @@ class SessionManager(QObject):
                     })
                 histentry['active'] = False
 
-            print(histentry)
             active = histentry.get('active', False)
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:

From aa40842848a60039c3978e0e7b8d0c3c4eb8f6e5 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Tue, 21 Nov 2017 00:38:51 +0100
Subject: [PATCH 10/17] lazy sessions, docstring formatted, settings renamed,
 javascript notice changed, insert method changed

---
 doc/help/commands.asciidoc        |  2 +-
 doc/help/settings.asciidoc        |  6 +++---
 qutebrowser/browser/qutescheme.py |  8 +++++---
 qutebrowser/config/configdata.yml |  8 +++++---
 qutebrowser/html/back.html        | 16 +++-------------
 qutebrowser/misc/sessions.py      | 27 ++++++++++++++++++---------
 tests/unit/misc/test_sessions.py  |  2 +-
 7 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 04377c055..aa94de305 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1070,7 +1070,7 @@ Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-win
 Save a session.
 
 ==== positional arguments
-* +'name'+: The name of the session. If not given, the session configured in session_default_name is saved.
+* +'name'+: The name of the session. If not given, the session configured in session.default_name is saved.
 
 
 ==== optional arguments
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 64881f619..9f694c184 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -222,7 +222,7 @@
 |<<qt.highdpi,qt.highdpi>>|Turn on Qt HighDPI scaling.
 |<<scrolling.bar,scrolling.bar>>|Show a scrollbar.
 |<<scrolling.smooth,scrolling.smooth>>|Enable smooth scrolling for web pages.
-|<<session_default_name,session_default_name>>|Name of the session to save by default.
+|<<session.default_name,session.default_name>>|Name of the session to save by default.
 |<<spellcheck.languages,spellcheck.languages>>|Languages to use for spell checking.
 |<<statusbar.hide,statusbar.hide>>|Hide the statusbar unless a message is shown.
 |<<statusbar.padding,statusbar.padding>>|Padding (in pixels) for the statusbar.
@@ -2554,8 +2554,8 @@ Type: <<types,Bool>>
 
 Default: +pass:[false]+
 
-[[session_default_name]]
-=== session_default_name
+[[session.default_name]]
+=== session.default_name
 Name of the session to save by default.
 If this is set to null, the session which was last loaded is saved.
 
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 3881a0d2e..4db7bdc84 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -427,10 +427,12 @@ def qute_settings(url):
 
 @add_handler('back')
 def qute_back(url):
-    """Handler for qute://back. Simple page to free ram / lazy load a site,
-    goes back on focusing the tab."""
+    """Handler for qute://back.
 
-    html = jinja.render('back.html', title='Suspended')
+    Simple page to free ram / lazy load a site, goes back on focusing the tab.
+    """
+    html = jinja.render('back.html',
+                        title='Suspended: ' + url.url().split('#')[-1])
     return 'text/html', html
 
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 7284d98d5..7f362daa4 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -79,6 +79,9 @@ new_instance_open_target_window:
     When `new_instance_open_target` is not set to `window`, this is ignored.
 
 session_default_name:
+  renamed: session.default_name
+
+session.default_name:
   type:
     name: SessionName
     none_ok: true
@@ -88,13 +91,12 @@ session_default_name:
 
     If this is set to null, the session which was last loaded is saved.
 
-session_lazy_restore:
+session.lazy_restore:
   type:
     name: Bool
     none_ok: true
   default: false
-  desc: >-
-    Load a restored tab as soon as it takes focus.
+  desc: Load a restored tab as soon as it takes focus.
 
 backend:
   type:
diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index c28419a64..0d06158f2 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -1,26 +1,16 @@
 {% extends "base.html" %}
 
 {% block script %}
-window.onload = function() {
-	var title = 'Suspended: ' + document.location.hash.substr(1);
-	var node = document.getElementsByTagName('h1')[0];
-	node.innerText = document.title = title;
-};
 setTimeout(function() {
 	/* drop first focus event, to avoid problems
 	(allow to go easily to newer history entries) */
-	var triggered = false;
 	window.onfocus = function() {
-		if (! triggered) {
-			triggered = true;
-			window.history.back();
-		}
+		window.onfocus = null;
+		window.history.back();
 	};
 }, 1000);
 {% endblock %}
 
 {% block content %}
-<noscript><h1 class="noscript">View Only</h1><p class="noscript-text">Changing settings requires javascript to be enabled!</p></noscript>
-<header><h1>{{ title }}</h1></header>
-
+<noscript><p class="noscript-text">Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
 {% endblock %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index c3634a64a..faee99c99 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -22,6 +22,8 @@
 import os
 import os.path
 
+from itertools import chain, dropwhile, takewhile
+
 import sip
 from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
 from PyQt5.QtWidgets import QApplication
@@ -205,8 +207,8 @@ class SessionManager(QObject):
         for idx, item in enumerate(tab.history):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
-            if item_data['url'].startswith('qute://back'):
-                # dont add qute://back to the session file
+            if item.url().url().startswith('qute://back'):
+                # don't add qute://back to the session file
                 if item_data.get('active', False) and data['history']:
                     # mark entry before qute://back as active
                     data['history'][-1]['active'] = True
@@ -257,7 +259,7 @@ class SessionManager(QObject):
                   object.
         """
         if name is default:
-            name = config.val.session_default_name
+            name = config.val.session.default_name
             if name is None:
                 if self._current is not None:
                     name = self._current
@@ -329,8 +331,16 @@ class SessionManager(QObject):
     def _load_tab(self, new_tab, data):
         """Load yaml data into a newly opened tab."""
         entries = []
+        lazy_load = []
+        # use len(data['history'])
+        # -> dropwhile empty if not session.lazy_session
+        lazy_index = len(data['history'])
+        gen = chain(
+            takewhile(lambda _: not lazy_load, enumerate(data['history'])),
+            enumerate(lazy_load),
+            dropwhile(lambda i: i[0] < lazy_index, enumerate(data['history'])))
 
-        for i, histentry in enumerate(data['history']):
+        for i, histentry in gen:
             user_data = {}
 
             if 'zoom' in data:
@@ -354,13 +364,12 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
-            if (config.val.session_lazy_restore and
+            if (config.val.session.lazy_restore and
                     histentry.get('active', False) and
                     not histentry['url'].startswith('qute://back')):
                 # remove "active" mark and insert back page marked as active
-                data['history'].insert(
-                    i + 1,
-                    {
+                lazy_index = i + 1
+                lazy_load.append({
                         'title': histentry['title'],
                         'url': 'qute://back#' + histentry['title'],
                         'active': True
@@ -481,7 +490,7 @@ class SessionManager(QObject):
 
         Args:
             name: The name of the session. If not given, the session configured
-                  in session_default_name is saved.
+                  in session.default_name is saved.
             current: Save the current session instead of the default.
             quiet: Don't show confirmation message.
             force: Force saving internal sessions (starting with an underline).
diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py
index 771430d5b..b2cb8a3dd 100644
--- a/tests/unit/misc/test_sessions.py
+++ b/tests/unit/misc/test_sessions.py
@@ -170,7 +170,7 @@ class TestSaveAll:
 ])
 def test_get_session_name(config_stub, sess_man, arg, config, current,
                           expected):
-    config_stub.val.session_default_name = config
+    config_stub.val.session.default_name = config
     sess_man._current = current
     assert sess_man._get_session_name(arg) == expected
 

From 607cd9ba6ee568849b111c2a950acb5c3ec0d9e8 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Tue, 21 Nov 2017 01:19:04 +0100
Subject: [PATCH 11/17] indent adjusted

---
 qutebrowser/misc/sessions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index faee99c99..7a26d161c 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -370,10 +370,10 @@ class SessionManager(QObject):
                 # remove "active" mark and insert back page marked as active
                 lazy_index = i + 1
                 lazy_load.append({
-                        'title': histentry['title'],
-                        'url': 'qute://back#' + histentry['title'],
-                        'active': True
-                    })
+                    'title': histentry['title'],
+                    'url': 'qute://back#' + histentry['title'],
+                    'active': True
+                })
                 histentry['active'] = False
 
             active = histentry.get('active', False)

From e2d5a443cc746885f6fb3512470298b168904e29 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Tue, 21 Nov 2017 23:57:06 +0100
Subject: [PATCH 12/17] lazy sessions

---
 qutebrowser/browser/qutescheme.py |  2 +-
 qutebrowser/config/configdata.yml |  4 +---
 qutebrowser/html/back.html        |  2 +-
 qutebrowser/misc/sessions.py      | 15 ++++++++-------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 4db7bdc84..f12ef529a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -432,7 +432,7 @@ def qute_back(url):
     Simple page to free ram / lazy load a site, goes back on focusing the tab.
     """
     html = jinja.render('back.html',
-                        title='Suspended: ' + url.url().split('#')[-1])
+                        title='Suspended: ' + url.fragment())
     return 'text/html', html
 
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 7f362daa4..39c0fa6b1 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -92,9 +92,7 @@ session.default_name:
     If this is set to null, the session which was last loaded is saved.
 
 session.lazy_restore:
-  type:
-    name: Bool
-    none_ok: true
+  type: Bool
   default: false
   desc: Load a restored tab as soon as it takes focus.
 
diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 0d06158f2..83f5cb74e 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -12,5 +12,5 @@ setTimeout(function() {
 {% endblock %}
 
 {% block content %}
-<noscript><p class="noscript-text">Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
+<noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
 {% endblock %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 7a26d161c..64d170dab 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -21,8 +21,7 @@
 
 import os
 import os.path
-
-from itertools import chain, dropwhile, takewhile
+import itertools
 
 import sip
 from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
@@ -207,7 +206,7 @@ class SessionManager(QObject):
         for idx, item in enumerate(tab.history):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
-            if item.url().url().startswith('qute://back'):
+            if item.url().scheme() == 'qute' and item.url().host() == 'back':
                 # don't add qute://back to the session file
                 if item_data.get('active', False) and data['history']:
                     # mark entry before qute://back as active
@@ -335,10 +334,12 @@ class SessionManager(QObject):
         # use len(data['history'])
         # -> dropwhile empty if not session.lazy_session
         lazy_index = len(data['history'])
-        gen = chain(
-            takewhile(lambda _: not lazy_load, enumerate(data['history'])),
-            enumerate(lazy_load),
-            dropwhile(lambda i: i[0] < lazy_index, enumerate(data['history'])))
+        gen = itertools.chain(
+                itertools.takewhile(lambda _: not lazy_load,
+                                    enumerate(data['history'])),
+                enumerate(lazy_load),
+                itertools.dropwhile(lambda i: i[0] < lazy_index,
+                                    enumerate(data['history'])))
 
         for i, histentry in gen:
             user_data = {}

From 9df149fe8fc0822fcdc6a718e3542782aca22fe6 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Fri, 24 Nov 2017 17:15:26 +0100
Subject: [PATCH 13/17] urlencode fix

---
 qutebrowser/browser/qutescheme.py | 6 ++++--
 qutebrowser/misc/sessions.py      | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index f12ef529a..9771f6db1 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -29,6 +29,7 @@ import os
 import time
 import textwrap
 import mimetypes
+import urllib
 
 import pkg_resources
 from PyQt5.QtCore import QUrlQuery, QUrl
@@ -431,8 +432,9 @@ def qute_back(url):
 
     Simple page to free ram / lazy load a site, goes back on focusing the tab.
     """
-    html = jinja.render('back.html',
-                        title='Suspended: ' + url.fragment())
+    html = jinja.render(
+            'back.html',
+            title='Suspended: ' + urllib.parse.unquote(url.fragment()))
     return 'text/html', html
 
 
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 64d170dab..1b0106f1b 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -22,6 +22,7 @@
 import os
 import os.path
 import itertools
+import urllib
 
 import sip
 from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
@@ -372,7 +373,9 @@ class SessionManager(QObject):
                 lazy_index = i + 1
                 lazy_load.append({
                     'title': histentry['title'],
-                    'url': 'qute://back#' + histentry['title'],
+                    'url':
+                        'qute://back#' +
+                        urllib.parse.quote(histentry['title']),
                     'active': True
                 })
                 histentry['active'] = False

From d29cf1ee4d0cf68b417d77de617ae7fbe24e3814 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Thu, 30 Nov 2017 00:09:28 +0100
Subject: [PATCH 14/17] lazy sessions, restore if visible, forward user after
 restore

---
 qutebrowser/html/back.html | 53 ++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 83f5cb74e..94d16824e 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -1,16 +1,53 @@
 {% extends "base.html" %}
 
 {% block script %}
-setTimeout(function() {
-	/* drop first focus event, to avoid problems
-	(allow to go easily to newer history entries) */
-	window.onfocus = function() {
-		window.onfocus = null;
-		window.history.back();
-	};
-}, 1000);
+const STATE_BACK = "back";
+const STATE_FORWARD = "forward";
+
+function switch_state(new_state) {
+	history.replaceState(
+		new_state,
+		document.title,
+		location.pathname+location.hash);
+}
+
+function go_back() {
+	switch_state(STATE_FORWARD);
+	history.back();
+}
+function go_forward() {
+	switch_state(STATE_BACK);
+	history.forward();
+}
+
+// there are three states
+// default: register focus listener,
+//	    on focus: go back and switch to the state forward
+// back: user came from a later history entry
+//	 -> switch to the state forward,
+//	    forward him to the previous history entry
+// forward: user came from a previous history entry
+//	 -> switch to the state back,
+//	    forward him to the next history entry
+switch (history.state) {
+	case STATE_BACK:
+		go_back();
+		break;
+	case STATE_FORWARD:
+		go_forward();
+		break;
+	default:
+		if (!document.hidden) {
+			go_back();
+			break;
+		}
+		
+		document.addEventListener("visibilitychange", go_back);
+		break;
+}
 {% endblock %}
 
 {% block content %}
 <noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
+<p>If you see this site something went wrong or you reached the end of the history or you disabled javascript.</p>
 {% endblock %}

From b58cfead05b201c3664fde8657556c5b260a9e6a Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Thu, 30 Nov 2017 16:05:01 +0100
Subject: [PATCH 15/17] style fixed

---
 qutebrowser/browser/qutescheme.py |  4 ++--
 qutebrowser/html/back.html        |  5 +++--
 qutebrowser/misc/sessions.py      | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 9771f6db1..247e12a78 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -433,8 +433,8 @@ def qute_back(url):
     Simple page to free ram / lazy load a site, goes back on focusing the tab.
     """
     html = jinja.render(
-            'back.html',
-            title='Suspended: ' + urllib.parse.unquote(url.fragment()))
+        'back.html',
+        title='Suspended: ' + urllib.parse.unquote(url.fragment()))
     return 'text/html', html
 
 
diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 94d16824e..b6190feda 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -8,13 +8,14 @@ function switch_state(new_state) {
 	history.replaceState(
 		new_state,
 		document.title,
-		location.pathname+location.hash);
+		location.pathname + location.hash);
 }
 
 function go_back() {
 	switch_state(STATE_FORWARD);
 	history.back();
 }
+
 function go_forward() {
 	switch_state(STATE_BACK);
 	history.forward();
@@ -49,5 +50,5 @@ switch (history.state) {
 
 {% block content %}
 <noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
-<p>If you see this site something went wrong or you reached the end of the history or you disabled javascript.</p>
+<p>If you see this site something went wrong, or you reached the end of the history, or you disabled javascript.</p>
 {% endblock %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 1b0106f1b..237e46189 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -336,11 +336,11 @@ class SessionManager(QObject):
         # -> dropwhile empty if not session.lazy_session
         lazy_index = len(data['history'])
         gen = itertools.chain(
-                itertools.takewhile(lambda _: not lazy_load,
-                                    enumerate(data['history'])),
-                enumerate(lazy_load),
-                itertools.dropwhile(lambda i: i[0] < lazy_index,
-                                    enumerate(data['history'])))
+            itertools.takewhile(lambda _: not lazy_load,
+                                enumerate(data['history'])),
+            enumerate(lazy_load),
+            itertools.dropwhile(lambda i: i[0] < lazy_index,
+                                enumerate(data['history'])))
 
         for i, histentry in gen:
             user_data = {}

From 28caddf3c1700f77c78173b3677abd71c8d9582a Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Mon, 4 Dec 2017 19:02:09 +0100
Subject: [PATCH 16/17] delay added, text changed

---
 qutebrowser/html/back.html | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index b6190feda..cfaae589b 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -21,6 +21,15 @@ function go_forward() {
 	history.forward();
 }
 
+function prepare_restore() {
+	if (!document.hidden) {
+		go_back();
+		break;
+	}
+		
+	document.addEventListener("visibilitychange", go_back);
+}
+
 // there are three states
 // default: register focus listener,
 //	    on focus: go back and switch to the state forward
@@ -38,17 +47,14 @@ switch (history.state) {
 		go_forward();
 		break;
 	default:
-		if (!document.hidden) {
-			go_back();
-			break;
-		}
-		
-		document.addEventListener("visibilitychange", go_back);
+		setTimeout(prepare_restore, 1000);
 		break;
 }
 {% endblock %}
 
 {% block content %}
 <noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
-<p>If you see this site something went wrong, or you reached the end of the history, or you disabled javascript.</p>
+<p>Loading suspended page...<br>
+<br>
+If nothing happens, something went wrong or you disabled JavaScript.</p>
 {% endblock %}

From 02104a318e9c8dfea690447a544f84c2dd19197b Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Mon, 4 Dec 2017 19:03:12 +0100
Subject: [PATCH 17/17] delay added, text changed

---
 qutebrowser/html/back.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index cfaae589b..46945ab65 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -24,7 +24,7 @@ function go_forward() {
 function prepare_restore() {
 	if (!document.hidden) {
 		go_back();
-		break;
+		return;
 	}
 		
 	document.addEventListener("visibilitychange", go_back);