Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: docteurklein/dot-files
base: 092555167b
...
head fork: docteurklein/dot-files
compare: 2b1f35f9a2
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 10 additions and 1 deletion.
  1. +3 −0  .gitmodules
  2. +5 −1 tmux.conf
  3. +1 −0  vim/bundle/neocomplcache
  4. +1 −0  vimrc
View
3  .gitmodules
@@ -82,3 +82,6 @@
[submodule "vim/bundle/twig"]
path = vim/bundle/twig
url = git://github.com/beyondwords/vim-twig.git
+[submodule "vim/bundle/neocomplcache"]
+ path = vim/bundle/neocomplcache
+ url = git://github.com/Shougo/neocomplcache.git
View
6 tmux.conf
@@ -19,7 +19,11 @@ set-option -g status-keys vi
set-window-option -g utf8 on
set-window-option -g mode-mouse off
-bind-key y save-buffer /tmp/tmux-buf \; run-shell "cat /tmp/tmux-buf | xclip -selection 'clipboard'; rm /tmp/tmux-buf;"
+# move tmux copy buffer into x clipboard
+bind-key y run "tmux show-buffer | xclip -i"
+
+# move x clipboard into tmux paste buffer
+bind-key p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer"
#bind-key C-a last-window
#bind-key | split-window -h
1  vim/bundle/neocomplcache
@@ -0,0 +1 @@
+Subproject commit db82c50a87ffb2636a1aee95247ea7f80ff06e6b
View
1  vimrc
@@ -332,6 +332,7 @@ com! -nargs=* Phpunit make <q-args> | cw
" dont use ":" as a keyword separator
set iskeyword-=:
+let g:neocomplcache_enable_at_startup = 1
"
" Snipmate
let g:snips_author = 'Florian Klein <florian.klein@free.fr>'

No commit comments for this range

Something went wrong with that request. Please try again.