update dotfiles

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/config/mutt/binds b/config/mutt/binds
index e09bf27..48f4b0d 100644 (file)
--- a/config/mutt/binds
+++ b/config/mutt/binds
@@ -1,7 +1,7 @@
 macro generic,index       <space> c?\t                     "list mailboxes"
 macro generic,index,pager <f1> c=\n                        "goto ="
 macro generic,index,pager <f2> c?\t/\\.Sab\n\n             "goto sab's mbox"
 macro generic,index       <space> c?\t                     "list mailboxes"
 macro generic,index,pager <f1> c=\n                        "goto ="
 macro generic,index,pager <f2> c?\t/\\.Sab\n\n             "goto sab's mbox"

-macro generic,index,pager <f3> c\Cuimaps://madcoder@mail.intersec.com/\nu "open intersec imap"
+macro generic,index,pager <f3> c\Cuimaps://madcoder@imap.intersec.com/\nu "open intersec imap"

 macro generic,index,pager <f4> c=debian\n                  "goto =debian"
 macro generic,index,pager <f5> ":source ~/.muttrc\n"       "Reload the muttrc"
 macro generic,index,pager <f9> ":toggle sidebar_visible\n" "Toggle sidebar"
 macro generic,index,pager <f4> c=debian\n                  "goto =debian"
 macro generic,index,pager <f5> ":source ~/.muttrc\n"       "Reload the muttrc"
 macro generic,index,pager <f9> ":toggle sidebar_visible\n" "Toggle sidebar"

diff --git a/config/zsh/20_environment b/config/zsh/20_environment
index f15bf7f..6c33ec7 100644 (file)
--- a/config/zsh/20_environment
+++ b/config/zsh/20_environment
@@ -19,12 +19,13 @@ export RLWRAP_HOME="$HOME/.cache/rlwrap/"
 export GTK_IM_MODULE=xim
 
 export BROWSER=chromium-browser
 export GTK_IM_MODULE=xim
 
 export BROWSER=chromium-browser

+export PYTHONPATH=/home/madcoder/local/lib/python/

 
 export LC_MESSAGES=C
 unset  LC_ALL
 unset  VERBOSE
 
 
 export LC_MESSAGES=C
 unset  LC_ALL
 unset  VERBOSE
 

-if [ $UID -eq 0 ]; then
+if [ $(whoami) = root ]; then

     PATH=~root/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
 else
     case "${PATH}" in
     PATH=~root/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
 else
     case "${PATH}" in

diff --git a/ctags b/ctags
index 0c4492f..535a880 100644 (file)
--- a/ctags
+++ b/ctags
@@ -1,2 +1,4 @@
 -R
 -o.tags
 -R
 -o.tags

+--excmd=pattern
+--c-kinds=cdefgmpstuvx

diff --git a/gitconfig b/gitconfig
index 892be41..65fb164 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -9,12 +9,10 @@
     unstash=stash apply
     amend=commit -s --amend
     squash=commit -s --amend -C HEAD
     unstash=stash apply
     amend=commit -s --amend
     squash=commit -s --amend -C HEAD

-    p=!git push origin HEAD

     debtag=!git tag -f -a -s -m `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'` `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'`
     b64=commit -sm'64bits fix'
     send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose -C -C -M --patience --to
     is-send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose --patience -C -C -M --to corp.software.review@news.intersec.com
     debtag=!git tag -f -a -s -m `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'` `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'`
     b64=commit -sm'64bits fix'
     send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose -C -C -M --patience --to
     is-send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose --patience -C -C -M --to corp.software.review@news.intersec.com

-    stage=add

     unstage=reset HEAD --
     track=add -N
     untrack=rm --cached
     unstage=reset HEAD --
     track=add -N
     untrack=rm --cached


@@ -28,8 +26,11 @@
     excludesfile=/home/madcoder/.git-excludes
     preloadindex=true
 
     excludesfile=/home/madcoder/.git-excludes
     preloadindex=true
 

+[notes]
+    displayRef = refs/notes/*
+

 [push]
 [push]

-    default = tracking
+    default = upstream

 
 [user]
     name = Pierre Habouzit
 
 [user]
     name = Pierre Habouzit


@@ -87,3 +88,5 @@
     pushInsteadOf = git://git.debian.org
     pushInsteadOf = git.debian.org:
 
     pushInsteadOf = git://git.debian.org
     pushInsteadOf = git.debian.org:
 

+[branch "*"]
+    mergeoptions = -Xpatience

diff --git a/muttrc b/muttrc
index ce4b857..ca09a89 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -49,9 +49,11 @@ set   imap_list_subscribed
 set   imap_user=madcoder
 set   imap_headers="X-DSPAM-Result"
 set   imap_pipeline_depth=32
 set   imap_user=madcoder
 set   imap_headers="X-DSPAM-Result"
 set   imap_pipeline_depth=32

+unset imap_passive

 set   certificate_file="~/.cache/mutt/certificates"
 set   header_cache="~/.cache/mutt/"
 set   message_cachedir="~/.cache/mutt/"
 set   certificate_file="~/.cache/mutt/certificates"
 set   header_cache="~/.cache/mutt/"
 set   message_cachedir="~/.cache/mutt/"

+set   message_cache_clean=yes

 set   mail_check=90
 set   timeout=15
 
 set   mail_check=90
 set   timeout=15
 


@@ -61,7 +63,7 @@ set   folder=imaps://hermes.madism.org/
 set   mbox=imaps://hermes.madism.org/
 set   postponed==drafts
 
 set   mbox=imaps://hermes.madism.org/
 set   postponed==drafts
 

-subscribe imaps://mail.intersec.com/INBOX
+subscribe imaps://imap.intersec.com/INBOX

 
 # regexpes
 set   mask=.
 
 # regexpes
 set   mask=.


@@ -90,7 +92,7 @@ set forward_format="fwd: %s (from %a)"
 set message_format="%s"
 #set sidebar_number_format="%?u?%u / ?%4m"
 
 set message_format="%s"
 #set sidebar_number_format="%?u?%u / ?%4m"
 

-alternates (pierre.habouzit|madcoder|pierre)@(intersec.(eu|fr|com)|madism.org|habouzit.net|debian.org)
+alternates (pierre.habouzit|madcoder|pierre|sabine.et.pierre|pierre.et.sabine)@(intersec.(eu|fr|com)|madism.org|habouzit.net|debian.org)

 set pop_host=pop.free.fr
 set pop_user=madmutt
 set pop_pass=madmutt
 set pop_host=pop.free.fr
 set pop_user=madmutt
 set pop_pass=madmutt

diff --git a/signature b/signature
index f68aeb8..8d133a5 100644 (file)
--- a/signature
+++ b/signature
@@ -1,3 +1,3 @@
 ·O·  Pierre Habouzit
 ·O·  Pierre Habouzit

-··O                                                madcoder@debian.org
+··O

 OOO                                                http://www.madism.org
 OOO                                                http://www.madism.org

diff --git a/signature.d/is b/signature.d/is
index 274ebe7..ce62e78 100644 (file)
--- a/signature.d/is
+++ b/signature.d/is
@@ -1,7 +1,5 @@
 Intersec <http://www.intersec.com>
 Intersec <http://www.intersec.com>

-Pierre Habouzit <pierre.habouzit@intersec.com> | Chief Software Architect
-Tél : +33 (0)1 5570 3346
+Pierre Habouzit <pierre.habouzit@intersec.com> | Chief Scientist

 Mob : +33 (0)6 1636 8131
 Mob : +33 (0)6 1636 8131

-Fax : +33 (0)1 5570 3332

 37 Rue Pierre Lhomme
 92400 Courbevoie
 37 Rue Pierre Lhomme
 92400 Courbevoie

diff --git a/ssh/config b/ssh/config
index 33108b7..2068249 100644 (file)
--- a/ssh/config
+++ b/ssh/config
@@ -2,14 +2,15 @@ HashKnownHosts no
 ControlMaster  auto
 ControlPath    ~/.cache/ssh/%l_%r@%h:%p
 Compression    yes
 ControlMaster  auto
 ControlPath    ~/.cache/ssh/%l_%r@%h:%p
 Compression    yes

+ControlPersist 30

 VerifyHostKeyDNS yes
 
 VerifyHostKeyDNS yes
 

-Host *
-    Compression yes
-

 Host *.inria.fr
     User        habouzit
 
 Host *.inria.fr
     User        habouzit
 

+Host *.corp
+    ForwardAgent yes
+

 #--- intersec ---
 Host demo-sfr
     Hostname    localhost
 #--- intersec ---
 Host demo-sfr
     Hostname    localhost


@@ -25,10 +26,6 @@ Host beacon
     Port        2222
     User        madcoder
 
     Port        2222
     User        madcoder
 

-Host pap
-    Hostname localhost
-    Port 2222
-

 Host rudy
     HostName    rudy.intersec.com
     Port        2222
 Host rudy
     HostName    rudy.intersec.com
     Port        2222


@@ -40,14 +37,40 @@ Host rood
     User        madcoder
 
 #--- madism ---
     User        madcoder
 
 #--- madism ---

+Host hephaistos
+    User         root
+    ForwardAgent yes
+    HostName     hephaistos.madism.org
+    Port         22
+    Cipher       arcfour
+    Compression  no
+
+Host nas
+    User         root
+    ForwardAgent yes
+    HostName     82.243.18.127
+    Port         2242
+    Cipher       arcfour
+    Compression  no
+

 Host *.madism.org
     User        madcoder
     ForwardAgent yes
 
 Host *.madism.org
     User        madcoder
     ForwardAgent yes
 

+Host git.madism.org
+    Port        2222
+    Hostname    88.190.14.41
+    ForwardAgent yes
+
+Host zeus
+    Port        2222
+    Hostname    88.190.14.41
+    ForwardAgent yes
+

 Host pan
     Port        2222
 Host pan
     Port        2222

-    HostName    pan.madism.org

     Hostname    88.191.52.104
     Hostname    88.191.52.104

+    ForwardAgent yes

 
 #--- X ---
 Host *.polytechnique.org
 
 #--- X ---
 Host *.polytechnique.org

diff --git a/toprc b/toprc
index d70184b..ab5da1c 100644 (file)
--- a/toprc
+++ b/toprc
@@ -1,14 +1,14 @@
-RCfile for "top with windows"          # shameless braggin'
-Id:a, Mode_altscr=1, Mode_irixps=1, Delay_time=3.000, Curwin=0
-Def    fieldscur=AEHIOQTWKNMXbcdfgjplrsuvyz
-       winflags=65336, sortindx=10, maxtasks=0
+top's Config File (Linux processes with windows)
+Id:f, Mode_altscr=1, Mode_irixps=1, Delay_time=3.000, Curwin=0
+Def    fieldscur=¥¨³´»½ÀÄ·º¹Å&')*+,-./012568<>?ABCFGHIJKLMNOPQRSTUVWXYZ[
+       winflags=65332, sortindx=18, maxtasks=0

        summclr=1, msgsclr=1, headclr=3, taskclr=1
        summclr=1, msgsclr=1, headclr=3, taskclr=1

-Job    fieldscur=ABXcefgjlrstuvyzMKNHIWOPQD
-       winflags=65072, sortindx=0, maxtasks=0
+Job    fieldscur=¥¦¹·º³´Ä»¼½§Å()*+,-./012568>?@ABCFGHIJKLMNOPQRSTUVWXYZ[
+       winflags=65316, sortindx=0, maxtasks=0

        summclr=6, msgsclr=6, headclr=7, taskclr=6
        summclr=6, msgsclr=6, headclr=7, taskclr=6

-Mem    fieldscur=ANOPQRSTUVXbcdefgjlmyzWHIK
-       winflags=65336, sortindx=13, maxtasks=0
+Mem    fieldscur=¥º»¼½¾¿ÀÁÃij´·Å&'()*+,-./0125689BFGHIJKLMNOPQRSTUVWXYZ[
+       winflags=65332, sortindx=21, maxtasks=0

        summclr=5, msgsclr=5, headclr=4, taskclr=5
        summclr=5, msgsclr=5, headclr=4, taskclr=5

-Usr    fieldscur=DEFGABXchijlopqrstuvyzMKNW
-       winflags=65328, sortindx=4, maxtasks=0
+Usr    fieldscur=¥¦§¨ª°¹·ºÄÅ)+,-./1234568;<=>?@ABCFGHIJKLMNOPQRSTUVWXYZ[
+       winflags=65316, sortindx=3, maxtasks=0

        summclr=3, msgsclr=3, headclr=2, taskclr=3
        summclr=3, msgsclr=3, headclr=2, taskclr=3

diff --git a/vim/filetype.vim b/vim/filetype.vim
index c0f12d2..65cd4b9 100644 (file)
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -11,6 +11,7 @@ augroup filetypedetect
   au BufRead,BufNewFile *.tpl              setf xhtml
   au BufRead,BufNewFile *.blk              setf c
   au BufRead,BufNewFile *.blkk             setf cpp
   au BufRead,BufNewFile *.tpl              setf xhtml
   au BufRead,BufNewFile *.blk              setf c
   au BufRead,BufNewFile *.blkk             setf cpp

+  au BufRead,BufNewFile *.adoc             setf asciidoc

 
   au BufRead,BufNewFile massif.*.txt       setf massif
 
 
   au BufRead,BufNewFile massif.*.txt       setf massif
 


@@ -28,6 +29,8 @@ augroup filetypedetect
   au BufNewFile,BufRead *.iop setf d
 
   au BufNewFile,BufRead .gitsendemail.* setf gitsendemail
   au BufNewFile,BufRead *.iop setf d
 
   au BufNewFile,BufRead .gitsendemail.* setf gitsendemail

+  au BufNewFile,BufRead COMMIT_EDITMSG  setf gitcommit
+  au BufNewFile,BufRead *.git/modules/*/config  setf gitconfig

 
   " Distinguish between HTML, XHTML and Django
   fun! s:FThtml()
 
   " Distinguish between HTML, XHTML and Django
   fun! s:FThtml()

diff --git a/vim/ftplugin/gitcommit.vim b/vim/ftplugin/gitcommit.vim
index a0c8f54..7de4423 100644 (file)
--- a/vim/ftplugin/gitcommit.vim
+++ b/vim/ftplugin/gitcommit.vim
@@ -67,10 +67,15 @@ if exists("g:git_diff_spawn_mode")
     endif
 endif
 
     endif
 endif
 

-ab cc:  Cc-Redmine: yes
-ab v:   Version:
-ab sob: Signed-off-by:
-ab ack: Acked-by:
-ab r:   Reviewed-by:
+func Eatchar(pat)
+    let c = nr2char(getchar(0))
+    return (c =~ a:pat) ? '' : c
+endfunc
+
+ia cc:  Cc-Redmine: yes<CR><C-R>=Eatchar('\s')<CR>
+ia v:   Version:
+ia sob: Signed-off-by:
+ia ack: Acked-by:
+ia r:   Reviewed-by:

 
 " }}}
 
 " }}}

diff --git a/vim/syntax/javascript.vim b/vim/syntax/javascript.vim
index 944ce9f..dacf406 100644 (file)
--- a/vim/syntax/javascript.vim
+++ b/vim/syntax/javascript.vim
@@ -7,7 +7,7 @@
 "              (ss) repaired several quoting and grouping glitches
 "              (ss) fixed regex parsing issue with multiple qualifiers [gi]
 "              (ss) additional factoring of keywords, globals, and members
 "              (ss) repaired several quoting and grouping glitches
 "              (ss) fixed regex parsing issue with multiple qualifiers [gi]
 "              (ss) additional factoring of keywords, globals, and members

-" Last Change: 2006 Jun 19
+" Last Change: 2010 Mar 25

 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded


@@ -28,16 +28,15 @@ if version < 600 && exists("javaScript_fold")
   unlet javaScript_fold
 endif
 
   unlet javaScript_fold
 endif
 

-syn case ignore
-
-
+syn region  javaScriptTpl              start=+<@+ms=b end=+@>+me=e contains=javaScriptCommentTodo,javaScriptLineComment,javaScriptCommentSkip,javaScriptComment,javaScriptSpecial,javaScriptStringD,javaScriptStringS,,javaScriptSpecialCharacter,javaScriptNumber,javaScriptRegexpString,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptOperator,javaScriptType,javaScriptStatement,javaScriptBoolean,javaScriptNull,javaScriptIdentifier,javaScriptLabel,javaScriptException,javaScriptMessage,javaScriptGlobal,javaScriptMember,javaScriptDeprecated,javaScriptReserved,javaScriptTplMark keepend
+syn match   javaScriptTplMark          "\(<@[=#]\?\|@>\)" contained

 syn keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
 syn match   javaScriptLineComment      "\/\/.*" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptCommentSkip      "^[ \t]*\*\($\|[ \t]\+\)"
 syn region  javaScriptComment         start="/\*"  end="\*/" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptSpecial         "\\\d\d\d\|\\."
 syn keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
 syn match   javaScriptLineComment      "\/\/.*" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptCommentSkip      "^[ \t]*\*\($\|[ \t]\+\)"
 syn region  javaScriptComment         start="/\*"  end="\*/" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptSpecial         "\\\d\d\d\|\\."

-syn region  javaScriptStringD         start=+"+  skip=+\\\\\|\\"+  end=+"\|$+  contains=javaScriptSpecial,@htmlPreproc
-syn region  javaScriptStringS         start=+'+  skip=+\\\\\|\\'+  end=+'\|$+  contains=javaScriptSpecial,@htmlPreproc
+syn region  javaScriptStringD         start=+"+  skip=+\\\\\|\\"+  end=+"\|$+  contains=javaScriptSpecial,@htmlPreproc,javaScriptTplMark
+syn region  javaScriptStringS         start=+'+  skip=+\\\\\|\\'+  end=+'\|$+  contains=javaScriptSpecial,@htmlPreproc,javaScriptTplMark

 
 syn match   javaScriptSpecialCharacter "'\\.'"
 syn match   javaScriptNumber          "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
 
 syn match   javaScriptSpecialCharacter "'\\.'"
 syn match   javaScriptNumber          "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"


@@ -51,7 +50,7 @@ syn keyword javaScriptType            Array Boolean Date Function Number Object String Reg
 syn keyword javaScriptStatement        return with
 syn keyword javaScriptBoolean          true false
 syn keyword javaScriptNull             null undefined
 syn keyword javaScriptStatement        return with
 syn keyword javaScriptBoolean          true false
 syn keyword javaScriptNull             null undefined

-syn keyword javaScriptIdentifier       arguments this var
+syn keyword javaScriptIdentifier       arguments this var let const

 syn keyword javaScriptLabel            case default
 syn keyword javaScriptException                try catch finally throw
 syn keyword javaScriptMessage          alert confirm prompt status
 syn keyword javaScriptLabel            case default
 syn keyword javaScriptException                try catch finally throw
 syn keyword javaScriptMessage          alert confirm prompt status


@@ -105,7 +104,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink javaScriptRepeat           Repeat
   HiLink javaScriptBranch           Conditional
   HiLink javaScriptOperator         Operator
   HiLink javaScriptRepeat           Repeat
   HiLink javaScriptBranch           Conditional
   HiLink javaScriptOperator         Operator

-  HiLink javaScriptType                     Type

   HiLink javaScriptStatement        Statement
   HiLink javaScriptFunction         Function
   HiLink javaScriptBraces           Function
   HiLink javaScriptStatement        Statement
   HiLink javaScriptFunction         Function
   HiLink javaScriptBraces           Function

diff --git a/vimperatorrc b/vimperatorrc
index d063d4d..92000bf 100644 (file)
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -1,9 +1,7 @@
 " 0.5.3 (created: 2007/12/21 19:26:07)
 " 0.5.3 (created: 2007/12/21 19:26:07)

-set showtabline=0
-set guioptions=

 set wim=list:longest,list:full
 set wim=list:longest,list:full

-set guioptions=

 set hinttimeout=250
 set activate-=tabopen
 set nofc
 set hinttimeout=250
 set activate-=tabopen
 set nofc

+set toolbars=none

 " vim: set ft=vim:
 " vim: set ft=vim:

diff --git a/vimrc b/vimrc
index 7127c78..ffd0d5f 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -223,12 +223,13 @@ if has("autocmd")
 
     au FileType debchangelog normal zO
 
 
     au FileType debchangelog normal zO
 

+    au FileType asciidoc setlocal tw=78 noet ts=8 sw=8

     au FileType javascript setlocal cindent tw=78 iskeyword+=$
     au FileType actionscript setlocal cindent tw=78 iskeyword+=$ noignorecase ff=dos
     au FileType mail setlocal noet iskeyword+=- tw=72
 
     au FileType haxe setlocal tw=78 noignorecase cin ai
     au FileType javascript setlocal cindent tw=78 iskeyword+=$
     au FileType actionscript setlocal cindent tw=78 iskeyword+=$ noignorecase ff=dos
     au FileType mail setlocal noet iskeyword+=- tw=72
 
     au FileType haxe setlocal tw=78 noignorecase cin ai

-    au FileType c,cpp setlocal tw=78 noignorecase "fo-=ro
+    au FileType d,c,cpp setlocal tw=78 noignorecase "fo-=ro

     au FileType ocaml,acute,omlet setlocal sw=2 sts=2 tw=78
     au FileType php  setlocal et fo+=ro tw=78 indentexpr= cin
     au FileType python setlocal foldmethod=indent foldnestmax=1
     au FileType ocaml,acute,omlet setlocal sw=2 sts=2 tw=78
     au FileType php  setlocal et fo+=ro tw=78 indentexpr= cin
     au FileType python setlocal foldmethod=indent foldnestmax=1


@@ -438,6 +439,8 @@ if has("gui_running") || &t_Co >= 88
     SynLink doxygenSpecialHeading          doxygenBrief
     SynLink doxygenParamDirection          doxygenSpecial
 
     SynLink doxygenSpecialHeading          doxygenBrief
     SynLink doxygenParamDirection          doxygenSpecial
 

+    exec <SID>myhi("javaScriptTpl",    "none",       "7fcf7f",    "none")
+    exec <SID>myhi("javaScriptTplMark","none",       "b218b2",    "none")

     exec <SID>myhi("doxygenComment",   "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenBrief",     "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenPrev",      "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenComment",   "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenBrief",     "none",       "6060ff",    "0f0f0f")
     exec <SID>myhi("doxygenPrev",      "none",       "6060ff",    "0f0f0f")


@@ -474,4 +477,5 @@ endif
 hi def link htmlTag htmlStatement
 hi def link htmlEndTag htmlStatement
 
 hi def link htmlTag htmlStatement
 hi def link htmlEndTag htmlStatement
 

+ia <buffer> sabine Sabine

 " }}}
 " }}}

diff --git a/xsessionrc b/xsessionrc
index f7ac710..1731f06 100755 (executable)
--- a/xsessionrc
+++ b/xsessionrc
@@ -1,7 +1,3 @@
 #! /bin/zsh
 
 . "$HOME/.config/zsh/20_environment"
 #! /bin/zsh
 
 . "$HOME/.config/zsh/20_environment"

-
-if which synclient &>/dev/null; then
-    synclient TapButton1=1 FastTaps=1 VertEdgeScroll=1 HorizEdgeScroll=1
-fi

diff --git a/zshenv b/zshenv
index fc8acbc..d85db87 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -34,7 +34,7 @@ function _chose_locale() {
 
 _chose_locale
 
 
 _chose_locale
 

-if test -d ~/dev/scm/git; then
+if test -d ~/dev/scm/git -a -z "$GIT_EXEC_PATH"; then

     export GIT_EXEC_PATH=~/dev/scm/git
     export PATH=~/dev/scm/git:${PATH}
 fi
     export GIT_EXEC_PATH=~/dev/scm/git
     export PATH=~/dev/scm/git:${PATH}
 fi