From d7036fe8a8fc40c66e01c21e29d264dc6880154a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 3 Jul 2017 15:41:34 +0200
Subject: [PATCH] Clarify history_session_interval and rename it to
 _gap_interval

"session" is already overloaded enough.
---
 qutebrowser/browser/qutescheme.py |  2 +-
 qutebrowser/config/configdata.yml | 10 +++++++---
 qutebrowser/html/history.html     |  2 +-
 qutebrowser/javascript/history.js |  4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index c809698d9..adf9f49b7 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -284,7 +284,7 @@ def qute_history(url):
             return 'text/html', jinja.render(
                 'history.html',
                 title='History',
-                session_interval=config.val.history_session_interval
+                gap_interval=config.val.history_gap_interval
             )
         else:
             # Get current date from query parameter, if not given choose today.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 6a6da6cf3..448476b95 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -20,11 +20,15 @@ confirm_quit:
   default: [never]
   desc: Whether to confirm quitting the application.
 
-history_session_interval:
+history_gap_interval:
   type: Int
   default: 30
-  desc: The maximum time in minutes between two history items for them to be considered
-    being from the same session. Use -1 to disable separation.
+  desc: >-
+    The maximum time in minutes between two history items for them to be
+    considered being from the same browsing session.
+
+    Items with less time between them are grouped when being displayed in `:history`.
+    Use -1 to disable separation.
 
 ignore_case:
   type:
diff --git a/qutebrowser/html/history.html b/qutebrowser/html/history.html
index 2c6c0a2f1..0eedea56d 100644
--- a/qutebrowser/html/history.html
+++ b/qutebrowser/html/history.html
@@ -54,7 +54,7 @@ table {
 <a href="#" id="load" style="display: none">Show more</a>
 <script type="text/javascript" src="qute://javascript/history.js"></script>
 <script type="text/javascript">
-    window.SESSION_INTERVAL = {{session_interval}} * 60 * 1000;
+    window.GAP_INTERVAL = {{gap_interval}} * 60 * 1000;
 
     window.onload = function() {
         var loadLink = document.getElementById('load');
diff --git a/qutebrowser/javascript/history.js b/qutebrowser/javascript/history.js
index f46ceb49d..12fa8f014 100644
--- a/qutebrowser/javascript/history.js
+++ b/qutebrowser/javascript/history.js
@@ -75,9 +75,9 @@ window.loadHistory = (function() {
 
         // Create session-separator and new tbody if necessary
         if (tbody.lastChild !== null && lastItemDate !== null &&
-                window.SESSION_INTERVAL > 0) {
+                window.GAP_INTERVAL > 0) {
             var interval = lastItemDate.getTime() - date.getTime();
-            if (interval > window.SESSION_INTERVAL) {
+            if (interval > window.GAP_INTERVAL) {
                 // Add session-separator
                 var sessionSeparator = document.createElement("td");
                 sessionSeparator.className = "session-separator";