From 55eabafc0d95c162ca2ac41b262622cdcf44e4e2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 13 Mar 2015 19:46:21 +0100
Subject: [PATCH] Rename completion -> history-length.

This is now renamed to cmd-history-max-items to avoid confusion with the web
history.
---
 qutebrowser/config/config.py     | 3 ++-
 qutebrowser/config/configdata.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 4ccec8691..4c9e30d1b 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -186,7 +186,7 @@ def _init_misc():
     from qutebrowser.misc import lineparser
     command_history = lineparser.LimitLineParser(
         standarddir.data(), 'cmd-history',
-        limit=('completion', 'history-length'),
+        limit=('completion', 'cmd-history-max-items'),
         parent=objreg.get('config'))
     objreg.register('command-history', command_history)
     save_manager.add_saveable('command-history', command_history.save,
@@ -259,6 +259,7 @@ class ConfigManager(QObject):
         ('colors', 'tab.indicator.error'): 'tabs.indicator.error',
         ('colors', 'tab.indicator.system'): 'tabs.indicator.system',
         ('tabs', 'auto-hide'): 'hide-auto',
+        ('completion', 'history-length'): 'cmd-history-max-items',
     }
     DELETED_OPTIONS = [
         ('colors', 'tab.seperator'),
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index e237121c8..18ded258b 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -322,7 +322,7 @@ DATA = collections.OrderedDict([
          "The height of the completion, in px or as percentage of the "
          "window."),
 
-        ('history-length',
+        ('cmd-history-max-items',
          SettingValue(typ.Int(minval=-1), '100'),
          "How many commands to save in the history.\n\n"
          "0: no history / -1: unlimited"),