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: twittoru/config
base: eb1c635dae
...
head fork: twittoru/config
compare: 47be4e9a4a
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 06, 2011
@twittoru Fix typo 8bb07d8
Commits on Apr 01, 2011
@twittoru misc fix 47be4e9
View
2  .gitmodules
@@ -30,4 +30,4 @@
url = https://github.com/tpope/vim-pathogen.git
[submodule "vim/bundle/skk.vim"]
path = vim/bundle/skk.vim
- url = git@github.com:twittoru/skk.vim.git
+ url = git://github.com/twittoru/skk.vim.git
View
73 emacs.d/init.el
@@ -270,37 +270,37 @@
;;}}}
;;{{{misc
-(if (not window-system)
- (tool-bar-mode 0)
- (menu-bar-mode 0)
- (scroll-bar-mode 0)
- (display-time-mode 0))
-
;font from http://sakito.jp/emacs/emacs23.html
(when (>= emacs-major-version 23)
- (set-face-attribute 'default nil
- :family "monaco"
- :height 140)
- (set-fontset-font
- (frame-parameter nil 'font)
- 'japanese-jisx0208
- '("Hiragino Maru Gothic Pro" . "iso10646-1"))
- (set-fontset-font
- (frame-parameter nil 'font)
- 'japanese-jisx0212
- '("Hiragino Maru Gothic Pro" . "iso10646-1"))
- (set-fontset-font
- (frame-parameter nil 'font)
- 'mule-unicode-0100-24ff
- '("monaco" . "iso10646-1"))
- (setq face-font-rescale-alist
- '(("^-apple-hiragino.*" . 1.1)
- (".*osaka-bold.*" . 1.1)
- (".*osaka-medium.*" . 1.2)
- (".*courier-bold-.*-mac-roman" . 1.0)
- (".*monaco cy-bold-.*-mac-cyrillic" . 0.9)
- (".*monaco-bold-.*-mac-roman" . 0.9)
- ("-cdac$" . 1.3))))
+ (eval-safe
+ (if (not window-system)
+ (tool-bar-mode 0)
+ (menu-bar-mode 0)
+ (scroll-bar-mode 0)
+ (display-time-mode 0))
+ (set-face-attribute 'default nil
+ :family "monaco"
+ :height 140)
+ (set-fontset-font
+ (frame-parameter nil 'font)
+ 'japanese-jisx0208
+ '("Hiragino Maru Gothic Pro" . "iso10646-1"))
+ (set-fontset-font
+ (frame-parameter nil 'font)
+ 'japanese-jisx0212
+ '("Hiragino Maru Gothic Pro" . "iso10646-1"))
+ (set-fontset-font
+ (frame-parameter nil 'font)
+ 'mule-unicode-0100-24ff
+ '("monaco" . "iso10646-1"))
+ (setq face-font-rescale-alist
+ '(("^-apple-hiragino.*" . 1.1)
+ (".*osaka-bold.*" . 1.1)
+ (".*osaka-medium.*" . 1.2)
+ (".*courier-bold-.*-mac-roman" . 1.0)
+ (".*monaco cy-bold-.*-mac-cyrillic" . 0.9)
+ (".*monaco-bold-.*-mac-roman" . 0.9)
+ ("-cdac$" . 1.3)))))
(setq default-frame-alist
(append (list
@@ -745,3 +745,18 @@
; '(font-lock-variable-name-face ((((type tty) (class color)) (:foreground "orange" :weight light))))
; '(isearch ((((type tty pc) (class color)) (:background "red" :foreground "yellow"))))
; '(lazy-highlight ((((type tty pc) (class color)) (:background "blue")))))
+
+;;http://weboo-returns.com/blog/emacs-shows-double-space-and-tab/
+(setq whitespace-style
+ '(tabs tab-mark spaces space-mark))
+(setq whitespace-space-regexp "\\(\x3000+\\)")
+(setq whitespace-display-mappings
+ '((space-mark ?\x3000 [?\□])
+ (tab-mark ?\t [?\xBB ?\t])))
+(eval-safe
+ (require 'whitespace)
+ (global-whitespace-mode 1)
+ (set-face-foreground 'whitespace-space "LightSlateGray")
+ (set-face-background 'whitespace-space "DarkSlateGray")
+ (set-face-foreground 'whitespace-tab "LightSlateGray")
+ (set-face-background 'whitespace-tab "DarkSlateGray"))
View
2  util/makealiases.sh
@@ -2,6 +2,6 @@
autoload zargs
setopt extendedglob
-d ../
+cd ../
zargs -l -I{} -- *~util -- ln -s `pwd`/{} $HOME/.{}
View
110 vim/syntax/pentadactyl.vim
@@ -1,110 +0,0 @@
-" Vim syntax file
-" Language: Pentadactyl configuration file
-" Maintainer: Doug Kearns <dougkearns@gmail.com>
-
-" TODO: make this pentadactyl specific - shared dactyl config?
-
-if exists("b:current_syntax")
- finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-syn include @javascriptTop syntax/javascript.vim
-unlet b:current_syntax
-
-syn include @cssTop syntax/css.vim
-unlet b:current_syntax
-
-syn match pentadactylCommandStart "\%(^\s*:\=\)\@<=" nextgroup=pentadactylCommand,pentadactylAutoCmd
-
-syn keyword pentadactylCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] ba[ck] bd[elete] beep bf[irst] bl[ast] bma[rk]
- \ bmarks bn[ext] bp[revious] br[ewind] bufd[o] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] cd chd[ir] cm[ap] cmapc[lear]
- \ cno[remap] colo[rscheme] com[mand] comc[lear] contexts cu[nmap] cuna[bbrev] delbm[arks] delc[ommand] delm[arks] delmac[ros]
- \ delqm[arks] dels[tyle] dia[log] dl do[autocmd] doautoa[ll] downl[oads] ec[ho] echoe[rr] echom[sg] em[enu] exe[cute]
- \ exta[dd] extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exts exu[sage] files fini[sh]
- \ fo[rward] frameo[nly] fw h[elp] helpa[ll] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear]
- \ ino[remap] iu[nmap] iuna[bbrev] javas[cript] js ju[mps] keepa[lt] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks
- \ mes[sages] messc[lear] mkp[entadactylrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen]
- \ optionu[sage] pa[geinfo] pagest[yle] pas pref[erences] prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw]
- \ re[load] reloada[ll] res[tart] run runt[ime] sa[nitize] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal]
- \ setl[ocal] sideb[ar] sil[ent] so[urce] st[op] stopa[ll] sty[le] styd[isable] styled[isable] stye[nable] stylee[nable]
- \ styt[oggle] stylet[oggle] tN[ext] t[open] tab taba[ttach] tabN[ext] tabc[lose] tabd[o] tabde[tach] tabdu[plicate] tabfir[st]
- \ tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs tbh[ide] tbs[how] tbt[oggle] time
- \ tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate] undoa[ll] unl[et] unm[ap] verb[ose]
- \ ve[rsion] vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open] winc[lose] wind[ow]
- \ winon[ly] wo[pen] wq wqa[ll] xa[ll] zo[om]
- \ contained
-
-syn match pentadactylCommand "!" contained
-
-syn keyword pentadactylAutoCmd au[tocmd] contained nextgroup=pentadactylAutoEventList skipwhite
-
-syn keyword pentadactylAutoEvent BookmarkAdd ColorScheme DOMLoad DownloadPost Fullscreen LocationChange PageLoadPre PageLoad
- \ PrivateMode Sanitize ShellCmdPost Enter LeavePre Leave
- \ contained
-
-syn match pentadactylAutoEventList "\(\a\+,\)*\a\+" contained contains=pentadactylAutoEvent
-
-syn region pentadactylSet matchgroup=pentadactylCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>"
- \ end="$" keepend oneline contains=pentadactylOption,pentadactylString
-
-syn keyword pentadactylOption act activate altwildmode au autocomplete awim cd cdpath complete cpt defsearch ds editor eht
- \ ei enc encoding eventignore extendedhinttags fenc fh fileencoding followhints go guioptions helpfile hf hi hin hintinputs
- \ hintkeys hintmatching hinttags hinttimeout history hk hm ht hto laststatus loadplugins lpl ls maxitems messages msgs newtab
- \ nextpattern pa pageinfo popups pps previouspattern rtp runtimepath sanitizeitems sanitizetimespan scr scroll sh shcf shell
- \ shellcmdflag showstatuslinks showtabline si ssli stal sts suggestengines titlestring urlseparator vbs verbose wia wic wig
- \ wildanchor wildcase wildignore wildmode wildoptions wildsort wim wis wop wordseparators wsp
- \ contained nextgroup=pentadactylSetMod
-
-" toggle options
-syn match pentadactylOption "\<\%(no\|inv\)\=\%(banghist\|bh\|errorbells\|eb\|exrc\|ex\|fullscreen\|fs\|ignorecase\|ic\)\>!\="
- \ contained nextgroup=pentadactylSetMod
-syn match pentadactylOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|jsd\|jsdebugger\)\>!\="
- \ contained nextgroup=pentadactylSetMod
-syn match pentadactylOption "\<\%(no\|inv\)\=\%(linksearch\|lks\|more\|online\|pornmode\|private\|showmode\|smd\)\>!\="
- \ contained nextgroup=pentadactylSetMod
-syn match pentadactylOption "\<\%(no\|inv\)\=\%(smartcase\|scs\|strictfocus\|sf\|online\|visualbell\|vb\|usermode\|um\)\>!\="
- \ contained nextgroup=pentadactylSetMod
-
-syn match pentadactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained
-
-syn region pentadactylJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline
-syn region pentadactylJavaScript matchgroup=pentadactylJavaScriptDelimiter
- \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold
-
-let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<='
-execute 'syn region pentadactylCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline'
-execute 'syn region pentadactylCss matchgroup=pentadactylCssDelimiter'
- \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold'
-
-syn match pentadactylNotation "<[0-9A-Za-z-]\+>"
-
-syn match pentadactylComment +".*$+ contains=pentadactylTodo,@Spell
-syn keyword pentadactylTodo FIXME NOTE TODO XXX contained
-
-syn region pentadactylString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline
-
-syn match pentadactylLineComment +^\s*".*$+ contains=pentadactylTodo,@Spell
-
-" NOTE: match vim.vim highlighting group names
-hi def link pentadactylAutoCmd pentadactylCommand
-hi def link pentadactylAutoEvent Type
-hi def link pentadactylCommand Statement
-hi def link pentadactylComment Comment
-hi def link pentadactylJavaScriptDelimiter Delimiter
-hi def link pentadactylCssDelimiter Delimiter
-hi def link pentadactylNotation Special
-hi def link pentadactylLineComment Comment
-hi def link pentadactylOption PreProc
-hi def link pentadactylSetMod pentadactylOption
-hi def link pentadactylString String
-hi def link pentadactylTodo Todo
-
-let b:current_syntax = "pentadactyl"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: tw=130 et ts=4 sw=4:
View
109 vim/syntax/vimperator.vim
@@ -1,109 +0,0 @@
-" Vim syntax file
-" Language: VIMperator configuration file
-" Maintainer: Doug Kearns <dougkearns@gmail.com>
-" Last Change: 2009 Aug 10
-
-" TODO: make this vimperator specific - shared liberator config?
-
-if exists("b:current_syntax")
- finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-syn include @javascriptTop syntax/javascript.vim
-unlet b:current_syntax
-
-syn include @cssTop syntax/css.vim
-unlet b:current_syntax
-
-syn match vimperatorCommandStart "\%(^\s*:\=\)\@<=" nextgroup=vimperatorCommand,vimperatorAutoCmd
-
-syn keyword vimperatorCommand ab[breviate] ab[clear] addo[ns] bN[ext] b[uffer] ba[ck] bd[elete] beep bf[irst] bl[ast] bma[rk]
- \ bmarks bn[ext] bp[revious] br[ewind] bufd[o] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] cd chd[ir] cm[ap] cmapc[lear]
- \ cno[remap] colo[rscheme] com[mand] comc[lear] cu[nmap] cuna[bbrev] delbm[arks] delc[ommand] delm[arks] delmac[ros]
- \ delqm[arks] dels[tyle] dia[log] dl do[autocmd] doautoa[ll] downl[oads] e[dit] ec[ho] echoe[rr] echom[sg] em[enu] exe[cute]
- \ exta[dd] extd[isable] extde[lete] exte[nable] extens[ions] exto[ptions] extp[references] exu[sage] files fini[sh] fo[rward]
- \ frameo[nly] fw h[elp] helpa[ll] ha[rdcopy] hi[ghlight] hist[ory] hs ia[bbrev] iabc[lear] im[ap] imapc[lear] ino[remap]
- \ iu[nmap] iuna[bbrev] javas[cript] js ju[mps] let loadplugins lpl ls ma[rk] macros map mapc[lear] marks mes[sages]
- \ messc[lear] mkv[imperatorrc] nm[ap] nmapc[lear] nno[remap] no[remap] noh[lsearch] norm[al] nu[nmap] o[pen] optionu[sage]
- \ pa[geinfo] pagest[yle] pas pc[lose] pl[ay] pref[erences] prefs pw[d] q[uit] qa[ll] qma[rk] qmarks quita[ll] re[draw]
- \ re[load] reloada[ll] res[tart] run runt[ime] sav[eas] sb[ar] sb[open] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal]
- \ sideb[ar] sil[ent] so[urce] st[op] stopa[ll] sty[le] tN[ext] t[open] tab tabN[ext] tabc[lose] tabd[o] tabde[tach]
- \ tabdu[plicate] tabe[dit] tabfir[st] tabl[ast] tabm[ove] tabn[ext] tabnew tabo[nly] tabopen tabp[revious] tabr[ewind] tabs
- \ tbh[ide] tbs[how] tbt[oggle] time tn[ext] toolbarh[ide] toolbars[how] toolbart[oggle] tp[revious] u[ndo] una[bbreviate]
- \ undoa[ll] unl[et] unm[ap] ve[rsion] vie[wsource] viu[sage] vm[ap] vmap[clear] vno[remap] vu[nmap] w[rite] wc[lose] win[open]
- \ winc[lose] wind[ow] wine[dit] wo[pen] wq wqa[ll] xa[ll] zo[om]
- \ contained
-
-syn match vimperatorCommand "!" contained
-
-syn keyword vimperatorAutoCmd au[tocmd] contained nextgroup=vimperatorAutoEventList skipwhite
-
-syn keyword vimperatorAutoEvent BookmarkAdd ColorSheme DOMLoad DownloadPost Fullscreen LocationChange PageLoadPre PageLoad
- \ PrivateMode ShellCmdPost VimperatorEnter VimperatorLeavePre VimperatorLeave
- \ contained
-
-syn match vimperatorAutoEventList "\(\a\+,\)*\a\+" contained contains=vimperatorAutoEvent
-
-syn region vimperatorSet matchgroup=vimperatorCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>"
- \ end="$" keepend oneline contains=vimperatorOption,vimperatorString
-
-syn keyword vimperatorOption act activate cd cdpath complete cpt defsearch ds editor eht ei enc encoding eventignore
- \ extendedhinttags fenc fileencoding fh followhints go guioptions helpfile hf hi hintinputs hintmatching hinttags hinttimeout
- \ history hm ht hto laststatus ls maxitems messages msgs newtab nextpattern pa pageinfo popups pps previouspattern rtp
- \ runtimepath scr scroll sh shcf shell shellcmdflag showstatuslinks showtabline ssli stal suggestengines titlestring
- \ urlseparator vbs verbose wic wig wildcase wildignore wildmode wildoptions wim wop wordseparators wsp
- \ contained nextgroup=vimperatorSetMod
-
-" toggle options
-syn match vimperatorOption "\<\%(no\|inv\)\=\%(errorbells\|eb\|exrc\|ex\|focuscontent\|fc\|fullscreen\|fs\|ignorecase\|ic\)\>!\="
- \ contained nextgroup=vimperatorSetMod
-syn match vimperatorOption "\<\%(no\|inv\)\=\%(incsearch\|is\|insertmode\|im\|hlsearch\|hls\|linksearch\|lks\)\>!\="
- \ contained nextgroup=vimperatorSetMod
-syn match vimperatorOption "\<\%(no\|inv\)\=\%(loadplugins\|lpl\|more\|online\|private\|showmode\|smd\|smartcase\|scs\)\>!\="
- \ contained nextgroup=vimperatorSetMod
-syn match vimperatorOption "\<\%(no\|inv\)\=\%(online\|visualbell\|vb\|usermode\|um\)\>!\="
- \ contained nextgroup=vimperatorSetMod
-
-syn match vimperatorSetMod "\%(\<[a-z_]\+\)\@<=&" contained
-
-syn region vimperatorJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline
-syn region vimperatorJavaScript matchgroup=vimperatorJavascriptDelimiter
- \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold
-
-let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<='
-execute 'syn region vimperatorCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline'
-execute 'syn region vimperatorCss matchgroup=vimperatorCssDelimiter'
- \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold'
-
-syn match vimperatorNotation "<[0-9A-Za-z-]\+>"
-
-syn match vimperatorComment +".*$+ contains=vimperatorTodo,@Spell
-syn keyword vimperatorTodo FIXME NOTE TODO XXX contained
-
-syn region vimperatorString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline
-
-syn match vimperatorLineComment +^\s*".*$+ contains=vimperatorTodo,@Spell
-
-" NOTE: match vim.vim highlighting group names
-hi def link vimperatorAutoCmd vimperatorCommand
-hi def link vimperatorAutoEvent Type
-hi def link vimperatorCommand Statement
-hi def link vimperatorComment Comment
-hi def link vimperatorJavascriptDelimiter Delimiter
-hi def link vimperatorCssDelimiter Delimiter
-hi def link vimperatorNotation Special
-hi def link vimperatorLineComment Comment
-hi def link vimperatorOption PreProc
-hi def link vimperatorSetMod vimperatorOption
-hi def link vimperatorString String
-hi def link vimperatorTodo Todo
-
-let b:current_syntax = "vimperator"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: tw=130 et ts=4 sw=4:
View
4 vimrc
@@ -120,6 +120,10 @@ autocmd FileType vim nnoremap <buffer> ,p :<C-u>echo len(filter(readfile($MYVIMR
autocmd FileType help nnoremap <buffer> q <C-w>c
" goodbye auto comment-out
autocmd FileType * setlocal formatoptions-=cro
+" for python
+autocmd FileType python setl autoindent
+autocmd FileType python setl smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
+autocmd FileType python setl tabstop=8 expandtab shiftwidth=4 softtabstop=4
"}}}
" 文字コードの自動認識 {{{
" form http://www.kawaz.jp/pukiwiki/?vim#content_1_7
View
7 zshrc
@@ -9,6 +9,7 @@ export GEM_HOME=~/local/lib/gems
[[ -x "`where cpanm`" ]] && export PERL5LIB="$HOME/local/lib/perl5:$PERL5LIB"
[[ -x "`where mono`" ]] && export PKG_CONFIG_PATH=/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
[[ -x "`where cabal`" ]] && export PATH=~/.cabal/bin:$PATH
+export PYTHONPATH=~/usr/lib/python2.6/site-packages:${PYTHONPATH}
#mailコマンドが使えない環境でエラーメッセージ表示させない //まあどおせ使わない
export MAILCHECK=0
@@ -44,13 +45,13 @@ bindkey '^R' history-incremental-pattern-search-backward
bindkey '^S' history-incremental-pattern-search-forward
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+#[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
fpath=(~/.zsh/function ${fpath})
# ヒストリの設定
HISTFILE=~/.zhistfile
-HISTSIZE=10000
-SAVEHIST=10000
+HISTSIZE=1000000
+SAVEHIST=1000000
# zargsを使う
autoload zargs

No commit comments for this range

Something went wrong with that request. Please try again.