Merge
authorHeiko Schlittermann (JUMPER) <hs@schlittermann.de>
Sun, 01 Sep 2013 12:59:50 +0200
changeset 6 3b312ac90a15
parent 5 7ce40ff50871 (current diff)
parent 1 bc7458fa65e1 (diff)
child 7 5b81887c26e9
Merge
.vim/.netrwhist
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sun Sep 01 12:59:50 2013 +0200
@@ -0,0 +1,2 @@
+syntax:glob
+.vim/netrwhist
--- a/.vim/.netrwhist	Sun Sep 01 12:59:13 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =4
-let g:netrw_dirhist_1='/tmp/x'
-let g:netrw_dirhist_2='/tmp'
-let g:netrw_dirhist_3='/home/heiko/xxx'
-let g:netrw_dirhist_4='/home/heiko/itelli/x'
--- a/.vim/ftplugin/cpp_hs12.vim	Sun Sep 01 12:59:13 2013 +0200
+++ b/.vim/ftplugin/cpp_hs12.vim	Sun Sep 01 12:59:50 2013 +0200
@@ -1,5 +1,6 @@
 "nach ~/.vim/ftplugin/
 "
+set foldmethod=syntax
 set equalprg=indent\ -kr
 
 nmap <C-G>f :call HS_format()<ENTER>
--- a/.vim/spell/de.utf-8.add	Sun Sep 01 12:59:13 2013 +0200
+++ b/.vim/spell/de.utf-8.add	Sun Sep 01 12:59:50 2013 +0200
@@ -457,3 +457,48 @@
 Gruppenrichtlinie
 Protocol
 Discovery
+Enso
+Drewag
+Accountdaten
+OpenDJ
+ActiveDirectory
+Hashes
+Anmeldeinformation
+ID
+passdb
+security
+user
+ldap
+ldap_search
+Nutzernamen
+sambaNTPassword
+uid
+Subprozess
+Betriebssystemaufrufe
+setuid
+NSS
+nsswitch
+conf
+passwd
+Verzeichnisdienste
+posixAccount
+uidNumber
+Verzeichnisdienst
+getpw
+getent
+id
+nss
+add
+script
+IDs
+group
+smbpasswd
+Kommandozeilenwerkzeug
+RFC3062
+Nutzeraccounts
+sambaNTPassord
+Filesharing
+systemweite
+Nameservice
+Dateiimport
+Berechtigungskonzept
Binary file .vim/spell/de.utf-8.add.spl has changed
--- a/.vimrc	Sun Sep 01 12:59:13 2013 +0200
+++ b/.vimrc	Sun Sep 01 12:59:50 2013 +0200
@@ -2,8 +2,9 @@
 set modeline
 filetype plugin on
 
+set makeprg=make\ -j\ 5
 set pastetoggle=<F12>
-set ts=8 sts=4 sw=4
+set ts=8 sts=4 sw=4 sr
 set autoindent
 set autowrite
 set textwidth=72