Revert "* fix for bug 2771: bind space to completion for vbash users."

This reverts commit a1fc2f044f2e08b78931821068d08e2ea384ff10.

8 files changed, 3 insertions, 43 deletions

diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/10vyatta-op
index db5ae9d..4eb5ba2 100644
--- a/etc/bash_completion.d/10vyatta-op
+++ b/etc/bash_completion.d/10vyatta-op
@@ -35,26 +35,8 @@ test -z "$_vyatta_default_pager" && \
 	--no-lessopen"
 declare -x VYATTA_PAGER=$_vyatta_default_pager
 
-_vyatta_op_do_key_bindings ()
-{
-  # if vbash
-  #   use '?' for help
-  #   use ' ' for completion
-  if [ "$SHELL" == "/bin/vbash" ]; then
-    if [ -f $HOME/.vyatta_key_query_help_disable ]; then
-      bind '"?": self-insert'
-    else
-      bind '"?": possible-completions'
-    fi
-    if [ -f $HOME/.vyatta_key_space_complete_disable ]; then
-      bind '" ": self-insert'
-    else
-      bind '" ": complete'
-    fi
-  fi
-}
-
-_vyatta_op_do_key_bindings
+# use '?' for help
+bind '"?": possible-completions'
 
 test -f /etc/default/vyatta && \
     source /etc/default/vyatta
diff --git a/templates/configure/node.def b/templates/configure/node.def
index 5d30510..67e17af 100644
--- a/templates/configure/node.def
+++ b/templates/configure/node.def
@@ -1,3 +1,2 @@
 help: Enter configure mode
 run: export _OFR_CONFIGURE=ok; newgrp vyattacfg; unset _OFR_CONFIGURE
-     _vyatta_op_do_key_bindings
diff --git a/templates/terminal/key/node.def b/templates/terminal/key/node.def
deleted file mode 100644
index 3303752..0000000
--- a/templates/terminal/key/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Configure key behaviors
diff --git a/templates/terminal/key/query-help/node.def b/templates/terminal/key/query-help/node.def
deleted file mode 100644
index c15f556..0000000
--- a/templates/terminal/key/query-help/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Enable/disable getting help using question mark
diff --git a/templates/terminal/key/query-help/node.tag/node.def b/templates/terminal/key/query-help/node.tag/node.def
deleted file mode 100644
index 8564490..0000000
--- a/templates/terminal/key/query-help/node.tag/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Enable/disable getting help using question mark (default enabled)
-allowed: echo -n 'enable' 'disable'
-run: if [ "$4" == 'disable' ]; then
-       touch $HOME/.vyatta_key_query_help_disable
-       bind '"?": self-insert'
-     else
-       rm -f $HOME/.vyatta_key_query_help_disable
-       bind '"?": possible-completions'
-     fi
diff --git a/templates/terminal/key/space-complete/node.def b/templates/terminal/key/space-complete/node.def
deleted file mode 100644
index e02e272..0000000
--- a/templates/terminal/key/space-complete/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Enable/disable space-completion
diff --git a/templates/terminal/key/space-complete/node.tag/node.def b/templates/terminal/key/space-complete/node.tag/node.def
deleted file mode 100644
index 0b5c40a..0000000
--- a/templates/terminal/key/space-complete/node.tag/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Enable/disable space-completion (default enabled)
-allowed: echo -n 'enable' 'disable'
-run: if [ "$4" == 'disable' ]; then
-       touch $HOME/.vyatta_key_space_complete_disable
-       bind '" ": self-insert'
-     else
-       rm -f $HOME/.vyatta_key_space_complete_disable
-       bind '" ": complete'
-     fi
diff --git a/templates/terminal/node.def b/templates/terminal/node.def
index cdc1793..85b7c7f 100644
--- a/templates/terminal/node.def
+++ b/templates/terminal/node.def
@@ -1 +1 @@
-help: Control terminal behaviors
+help: Control terminal paging