summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIryna Cherniavska <i.chernyavska@gmail.com>2015-08-02 20:56:11 -0700
committerIryna Cherniavska <i.chernyavska@gmail.com>2015-08-02 20:56:11 -0700
commit68aba40b2dfc9ae68657bcd2139a1897f3ab7f84 (patch)
tree28b247cddbc8e03c8ac646343396b3356e7f0f8d
parent47c9af815d062e4c1c5bd0750246b3c28cf740ec (diff)
parent5fdd831d3ef57c0ce67911bc521c61a664fa45c6 (diff)
Merge pull request #313 from dbcli/amjith/config_comment_vi_mode
Add a comment about the keybindings in pgclirc.
-rwxr-xr-xpgcli/main.py4
-rw-r--r--pgcli/pgclirc7
2 files changed, 7 insertions, 4 deletions
diff --git a/pgcli/main.py b/pgcli/main.py
index 6e9dc1a1..4645fef5 100755
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -71,7 +71,7 @@ class PGCli(object):
self.pgspecial.timing_enabled = c['main'].as_bool('timing')
self.table_format = c['main']['table_format']
self.syntax_style = c['main']['syntax_style']
- self.display_completions_in_columns = c['main'].as_bool('display_completions_in_columns')
+ self.wider_completion_menu = c['main'].as_bool('wider_completion_menu')
self.logger = logging.getLogger(__name__)
self.initialize_logging()
@@ -242,7 +242,7 @@ class PGCli(object):
reserve_space_for_menu=True,
get_prompt_tokens=prompt_tokens,
get_bottom_toolbar_tokens=get_toolbar_tokens,
- display_completions_in_columns=self.display_completions_in_columns,
+ display_completions_in_columns=self.wider_completion_menu,
extra_input_processors=[
# Highlight matching brackets while editing.
ConditionalProcessor(
diff --git a/pgcli/pgclirc b/pgcli/pgclirc
index dbcd12a1..d6685f82 100644
--- a/pgcli/pgclirc
+++ b/pgcli/pgclirc
@@ -7,7 +7,7 @@ smart_completion = True
# Display the completions in several columns. (More completions will be
# visible.)
-display_completions_in_columns = False
+wider_completion_menu = False
# Multi-line mode allows breaking up the sql statements into multiple lines. If
# this is set to True, then the end of the statements must have a semi-colon.
@@ -38,7 +38,10 @@ table_format = psql
# colorful, murphy, bw, pastie, paraiso-light, trac, default, fruity
syntax_style = default
-# Enables vi-mode
+# Keybindings:
+# When Vi mode is enabled you can use modal editing features offered by Vi in the REPL.
+# When Vi mode is disabled emacs keybindings such as Ctrl-A for home and Ctrl-E
+# for end are available in the REPL.
vi = False
# Named queries are queries you can rexecute by name