From f0f244c618ab26db2502b9be7c13d9ec4eb3f005 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 31 Oct 2012 18:42:40 +0900 Subject: [PATCH 1/3] fix typo and so on --- bashrc | 6 +++--- emacs.el | 2 +- setup.sh | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bashrc b/bashrc index 577cf27..86dc12b 100755 --- a/bashrc +++ b/bashrc @@ -39,7 +39,7 @@ then else export PAGER="less" fi -export LESS="-iRMXF" +export LESS="-iRMX" if null type vim then @@ -51,7 +51,7 @@ export LANG=ja_JP.UTF-8 export LC_MESSAGES=C # export CDPATH=".:~" export VISUAL="$EDITOR" -export GIT_PAGER="$PAGER" +export GIT_PAGER="less -F" export GIT_EDITOR="$EDITOR" echo "$TERM" | grep '^screen' >/dev/null 2>&1 || export TERM_ORIG=$TERM test "$TERM" = screen && test "$TERM_ORIG" = xterm-256color && TERM=screen-256color @@ -105,7 +105,7 @@ iswindows && alias grep="grep -n" # alias ll="ls -l" # alias la="ls -A" # alias lla="ls -Al" -# alias less="" +alias less="less -F" alias em="emacs -nw" null type vim && alias vi=vim alias pstree="LANG=C pstree" diff --git a/emacs.el b/emacs.el index cdd486e..4be729a 100644 --- a/emacs.el +++ b/emacs.el @@ -282,7 +282,7 @@ otherwise the path where the library installed." (setq completion-ignore-case t read-file-name-completion-ignore-case t read-buffer-completion-ignore-case t) -(setq resize-mini-window t) +(setq resize-mini-windows t) (temp-buffer-resize-mode 1) (savehist-mode 1) diff --git a/setup.sh b/setup.sh index 64c540e..f02537b 100755 --- a/setup.sh +++ b/setup.sh @@ -71,6 +71,7 @@ git_config(){ # git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso" git config --global alias.addi "add -i" git config --global alias.clean-p "!test -z \"\$(git status -s -uno)\"" + # git config --global push.default "simple" if _iswindows; then git config --global core.fileMode false fi From fe974e1f30da925a27d37df751e7a908da7fb70b Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 31 Oct 2012 22:25:59 +0900 Subject: [PATCH 2/3] set mode-bg and mode-fg --- tmux.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tmux.conf b/tmux.conf index 8256825..5403c0a 100644 --- a/tmux.conf +++ b/tmux.conf @@ -12,6 +12,7 @@ set -g default-command /bin/bash #set -g default-terminal screen-256color #set -g default-terminal screen-16color set default-path "${HOME}" # not work as i expected +set -g set-titles on #set -g status-left "" #set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)" @@ -19,8 +20,6 @@ set -g status-right "${USER}@#H | #(tmux -V) " set message-bg black set message-fg yellow -set -g set-titles on - set -g status-bg green set -g status-fg white if "test `hostname` = arch-aspireone" \ @@ -34,3 +33,6 @@ if "test `hostname` = newkiwi" \ setw -g window-status-current-fg black setw -g window-status-current-bg white setw -g window-status-current-attr bold + +set -g mode-bg white +set -g mode-fg black From 09672b95a2dd2446157b6d442fc810b822e5008a Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 6 Nov 2012 20:38:35 +0900 Subject: [PATCH 3/3] add scroll key bindings as scroll for term-mode --- emacs.el | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/emacs.el b/emacs.el index 4be729a..642d7d4 100644 --- a/emacs.el +++ b/emacs.el @@ -994,7 +994,16 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit." (define-key term-raw-map "\C-x" (lookup-key (current-global-map) "\C-x")) (define-key term-raw-map - "\C-z" (lookup-key (current-global-map) "\C-z"))) + "\C-z" (lookup-key (current-global-map) "\C-z")) + ) + ;; (define-key term-raw-map "\C-xl" 'term-line-mode) + ;; (define-key term-mode-map "\C-xc" 'term-char-mode) + (define-key term-raw-map (kbd "") + (lambda () (interactive) (scroll-down 1))) + (define-key term-raw-map (kbd "") + (lambda () (interactive) (scroll-up 1))) + (define-key term-raw-map (kbd "") 'scroll-up) + (define-key term-raw-map (kbd "") 'scroll-down) (define-key term-raw-map (kbd "C-p") 'term-send-raw) (define-key term-raw-map (kbd "C-n") 'term-send-raw) (define-key term-raw-map "q" 'my-term-quit-or-send-raw)