Skip to content

Commit

Permalink
Use plus when Ctrl+G, instead of caret.
Browse files Browse the repository at this point in the history
  • Loading branch information
trogdoro committed Oct 18, 2016
1 parent 3240060 commit 27a92d9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
11 changes: 2 additions & 9 deletions bin/.xsh
Expand Up @@ -205,17 +205,10 @@ if [[ $- =~ i ]]; then

if [ $xiki_go_key ]; then
if [ -n "$ZSH_VERSION" ]; then

if [[ -o extended_glob ]]; then
# Weird setting that messes up caret
bindkey -s $xiki_go_key '\C-axsh \\\^\n'
else
# Normal zsh
bindkey -s $xiki_go_key '\C-axsh \^\n'
fi
bindkey -s $xiki_go_key '\C-axsh +\n'

else # Assume bash or bash-compatible
bind \"$xiki_go_key'" "\C-axsh ^\n"'
bind \"$xiki_go_key'" "\C-axsh +\n"'
fi
fi

Expand Down
5 changes: 0 additions & 5 deletions lib/xiki/core/view.rb
Expand Up @@ -2383,11 +2383,6 @@ def self.expose
# Results in 5 columns
individual_width = whole_width / 4

Ol Buffers.list_names(:user_only=>1)

# Set 1st view
Ol Buffers.list

count = 0

buffers = Buffers.list_names(:user_only=>1)
Expand Down
8 changes: 3 additions & 5 deletions lib/xiki/core/xsh.rb
Expand Up @@ -69,13 +69,11 @@ def self.run options={}
args = ""

# xsh = > or > ^G...
elsif args == "^"

# -/, so recognize as ^G on blank line...
elsif args == "+"

# Jump back to last place we were (or last place content+grab was run)
self.to_go_location
options[:do_nothing] = 1
return self.to_go_location

# xsh - > or > ^T...
elsif args == "-"
Expand Down Expand Up @@ -209,7 +207,7 @@ def self.run options={}
args = View.dir

# -foo/, so treat as xiki command...
elsif args.slice!(/^\^/)
elsif args.slice!(/^\+/)

# grab+ on ^bookmark, so cd and exit...

Expand Down

0 comments on commit 27a92d9

Please sign in to comment.