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