From 1651f39ed775e0b76cc8711fe740364277d05c36 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 1 Mar 2009 19:23:49 +0100 Subject: [PATCH 01/16] add words --- .vim/spell/en.utf-8.add | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 2c27beb..1df8153 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -75,3 +75,5 @@ devel pkg panelists anonymise +panelist +anonymising -- 2.39.5 From 6c8c3c135c5ce5f2290957a4b50eeadbec668cc9 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 16 Mar 2009 08:46:57 +0100 Subject: [PATCH 02/16] use vim-scripts lbdbq plugin --- .vim/plugin/lbdbq.vim | 125 +----------------------------------------- 1 file changed, 1 insertion(+), 124 deletions(-) mode change 100644 => 120000 .vim/plugin/lbdbq.vim diff --git a/.vim/plugin/lbdbq.vim b/.vim/plugin/lbdbq.vim deleted file mode 100644 index a2a5c27..0000000 --- a/.vim/plugin/lbdbq.vim +++ /dev/null @@ -1,124 +0,0 @@ -" Name: lbdbq.vim -" Summary: functions and mode mappings for querying lbdb from Vim -" Copyright: Copyright (C) 2007 Stefano Zacchiroli -" License: GNU GPL version 3 or above -" Maintainer: Stefano Zacchiroli -" URL: http://www.vim.org/scripts/script.php?script_id=1757 -" Version: 0.3 - -if exists("loaded_lbdbq") - finish -endif -let loaded_lbdbq = 1 - -" queries lbdb with a query string and return a list of pairs: -" [['full name', 'email'], ['full name', 'email'], ...] -function! LbdbQuery(qstring) - let output = system("lbdbq '" . a:qstring . "'") - let results = [] - for line in split(output, "\n")[1:] " skip first line (lbdbq summary) - let fields = split(line, "\t") - let results += [ [fields[1], fields[0]] ] - endfor - return results -endfunction - -" check if a potential query string has already been expanded in a complete -" recipient. E.g.: 'Stefano Zacchiroli ' is a complete -" recipient, 'stefano zacchiroli' and 'stefano' are not -function! LbdbIsExpanded(qstring) - return (a:qstring =~ '^\S\+@\S\+$\|<\S\+@\S\+>$') -endfunction - -function! LbdbTrim(s) - return substitute(a:s, '^\s*\(.\{-}\)\s*$', '\1', '') -endfunction - -" expand a (short) contact given as a query string, asking interactively if -" disambiguation is needed -" E.g.: 'stefano zacchiroli' -> 'Stefano Zacchiroli ' -function! LbdbExpandContact(qstring) - let qstring = LbdbTrim(a:qstring) - if LbdbIsExpanded(qstring) - return qstring - else " try to expand (short) contact - let contacts = LbdbQuery(qstring) - let contact = [] - if empty(contacts) " no matching (long) contact found - return qstring - elseif len(contacts) > 1 " multiple matches: disambiguate - echo "Choose a recipient for '" . qstring . "':" - let choices = [] - let counter = 0 - for contact in contacts - let choices += [ printf("%2d. %s <%s>", counter, contact[0], contact[1]) ] - let counter += 1 - endfor - let contact = contacts[inputlist(choices)] - else " len(contacts) == 1, i.e. one single match - let contact = contacts[0] - endif - return printf("\"%s\" <%s>", escape(contact[0], '"'), contact[1]) - endif -endfunction - -" as above but support input strings composed by comma separated (short) -" contacts -function! LbdbExpandContacts(raw) - let raw = LbdbTrim(a:raw) - let qstrings = split(raw, '\s*,\s*') - let exp_strings = [] - for qstring in qstrings - let exp_strings += [ LbdbExpandContact(qstring) ] - endfor - return join(exp_strings, ', ') -endfunction - -" expand all (short) contacts on a given recipient line, asking interactively -" if disambiguation is needed. -" E.g.: -" 'To: stefano zacchiroli, bram' -" -> 'To: Stefano Zacchiroli , Bram Moolenaar -function! LbdbExpandRcptLine(recpt_line) - if a:recpt_line =~ '^\w\+:' " line is the *beginning* of a RFC822 field - let raw = substitute(a:recpt_line, '^\w\+:\s*', '', '') - let recpt_kind = substitute(a:recpt_line, '^\(\w\+\):\s*.*$', '\1', '') - let exp_line = recpt_kind . ': ' . LbdbExpandContacts(raw) - elseif a:recpt_line =~ '^\s\+' " line is the *continuation* of a RFC822 field - let raw = substitute(a:recpt_line, '^\s\+', '', '') - let lpadding = substitute(a:recpt_line, '\S.*$', '', '') - let exp_line = lpadding . LbdbExpandContacts(raw) - else - return a:recpt_line - endif - if a:recpt_line =~ ',\s*$' - let exp_line .= ',' - endif - return exp_line -endfunction - -function! LbdbExpandCurLine() - call setline(line('.'), LbdbExpandRcptLine(getline('.'))) -endfunction - -function! LbdbExpandVisual() - if visualmode() ==# 'v' - normal gvy - let raw = getreg('"') - let expanded = '' - if raw =~ "," - let expanded = LbdbExpandContacts(raw) - else - let expanded = LbdbExpandContact(raw) - endif - call setreg('"', expanded) - normal gvP - elseif visualmode() ==# 'V' - call LbdbExpandCurLine() - end -endfunction - -nmap lb :call LbdbExpandCurLine() -vmap lb :call LbdbExpandVisual() -imap lb :call LbdbExpandCurLine()A - diff --git a/.vim/plugin/lbdbq.vim b/.vim/plugin/lbdbq.vim new file mode 120000 index 0000000..8ce9043 --- /dev/null +++ b/.vim/plugin/lbdbq.vim @@ -0,0 +1 @@ +/usr/share/vim-scripts/plugin/lbdbq.vim \ No newline at end of file -- 2.39.5 From 191a1809faffe36f8f8ce9d3beb1480123c997a7 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 8 Jun 2009 11:34:05 +0200 Subject: [PATCH 03/16] add lref/llabel to tex syntax def --- .vim/after/syntax/tex.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vim/after/syntax/tex.vim b/.vim/after/syntax/tex.vim index 7a7914e..ea9ea67 100644 --- a/.vim/after/syntax/tex.vim +++ b/.vim/after/syntax/tex.vim @@ -1,5 +1,5 @@ -syn region texRefZone matchgroup=texRefZone start="\\[acefmpt]label{" end="}\|%stopzone\>" contains=@texRefGroup -syn region texRefZone matchgroup=texRefZone start="\\[aAcCeEfFmMpPtT][rvx]\=ref{" end="}\|%stopzone\>" contains=@texRefGroup +syn region texRefZone matchgroup=texRefZone start="\\[acefmptl]label{" end="}\|%stopzone\>" contains=@texRefGroup +syn region texRefZone matchgroup=texRefZone start="\\[aAcCeEfFmMpPtTlL][rvx]\=ref{" end="}\|%stopzone\>" contains=@texRefGroup syn region texMyForeign matchgroup=texTypeStyle start="\\foreign{" end="}" contains=texMatcher,@NoSpell syn cluster texFoldGroup add=texMyForeign -- 2.39.5 From 409e1493ea45058136564685915ae4dd6c8a427a Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 7 Jul 2009 20:33:52 +0200 Subject: [PATCH 04/16] flag trailing spaces as errors --- .vim/colors/madduck.vim | 2 +- .vimrc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.vim/colors/madduck.vim b/.vim/colors/madduck.vim index 6d62396..3947d39 100644 --- a/.vim/colors/madduck.vim +++ b/.vim/colors/madduck.vim @@ -56,7 +56,7 @@ else hi mailQuoted5 ctermfg=darkmagenta hi mailQuoted6 ctermfg=darkgreen - hi Error ctermfg=White ctermbg=Red cterm=reverse term=reverse + hi Error ctermfg=White ctermbg=Red cterm=none term=none hi Todo ctermfg=Black ctermbg=Yellow cterm=standout term=standout hi SpellBad ctermfg=white ctermbg=darkred cterm=none term=reverse diff --git a/.vimrc b/.vimrc index 176cf78..209d079 100644 --- a/.vimrc +++ b/.vimrc @@ -1517,3 +1517,5 @@ source $HOME/.vim/macros/table.vim let g:SuperTabMappingForward = '' let g:SuperTabMappingBackward = '' + +match Error /\s\+$/ -- 2.39.5 From cf64700550e4c1345d2b7e9cfe73ca07b3a65135 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 7 Jul 2009 20:34:25 +0200 Subject: [PATCH 05/16] iab to hyphenate e-mail --- .vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vimrc b/.vimrc index 209d079..27f219e 100644 --- a/.vimrc +++ b/.vimrc @@ -1509,6 +1509,10 @@ iab mbbg Mit bundesbrüderlichen Grüßen iab mvbg Mit verbandsbrüderlichen Grüßen iab vd Vielen Dank iab vld Vielen lieben Dank +iab email e-mail +iab emails e-mails +iab Email E-mail +iab Emails E-mails let &cpo=s:cpo_save unlet s:cpo_save -- 2.39.5 From 0e5f4f3825a0f5a0a58b386f094f3a45b072d893 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 4 Aug 2009 17:14:12 +0200 Subject: [PATCH 06/16] only flag trailing spaces as errors when not inserting --- .vimrc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index 27f219e..d9b3236 100644 --- a/.vimrc +++ b/.vimrc @@ -1453,11 +1453,16 @@ autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/* autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif " disable list mode when inserting stuff, otherwise keep it enabled, it's -" useful +" useful (see also setting lcs) augroup listinsert autocmd InsertEnter * set nolist autocmd InsertLeave * set list augroup end +" flag trailing spaces as error only when not inserting +augroup tsperrorinsert + autocmd InsertEnter * match none /\s\+$/ + autocmd InsertLeave * match Error /\s\+$/ +augroup end if &cp | set nocp | endif let s:cpo_save=&cpo @@ -1521,5 +1526,3 @@ source $HOME/.vim/macros/table.vim let g:SuperTabMappingForward = '' let g:SuperTabMappingBackward = '' - -match Error /\s\+$/ -- 2.39.5 From 966b9444bb93aab229e2b6b03d183fed700e1762 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 22 Aug 2009 11:58:01 +0200 Subject: [PATCH 07/16] add [{ and ]} as normal motion commands --- .vim/spell/en.utf-8.add | 6 ++++++ .vimrc | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 1df8153..88bbe83 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -77,3 +77,9 @@ panelists anonymise panelist anonymising +Peercolation +debhelper +autotools +Genericity +lintian +Likert diff --git a/.vimrc b/.vimrc index d9b3236..1030ac6 100644 --- a/.vimrc +++ b/.vimrc @@ -1500,6 +1500,11 @@ map sy :echo synIDattr(synID(line("."), col("."), 1), "name") map / :nohlsearch +omap [{ :normal {jj +nmap [{ :normal {jj +omap ]} :normal }kk +nmap ]} :normal }kk + iab sgf Sehr geehrte Frau iab sgh Sehr geehrter Herr iab lf Liebe Frau -- 2.39.5 From cdaa27f1decaaa2fcc12aea15dbe7fb2ed2c0a64 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 22 Aug 2009 13:51:28 +0200 Subject: [PATCH 08/16] use last-position-jump as example --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 1030ac6..27aeeb4 100644 --- a/.vimrc +++ b/.vimrc @@ -1450,7 +1450,7 @@ autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0 " jump to last known position in file (:he last-position-jump) -autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif +autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g`\"zz" | endif " disable list mode when inserting stuff, otherwise keep it enabled, it's " useful (see also setting lcs) -- 2.39.5 From e5236e4266edb50c66951fd8b0f2e2abb179a32e Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 22 Aug 2009 13:50:51 +0200 Subject: [PATCH 09/16] increase updatetime to 10s --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 27aeeb4..b0a86f8 100644 --- a/.vimrc +++ b/.vimrc @@ -1108,6 +1108,7 @@ set dir=.,$TMPDIR//,/var/tmp//,/tmp// " updatetime " time in msec after which the swap file will be updated " set ut=4000 +set ut=10000 " maxmem " maximum amount of memory in Kbyte used for one buffer -- 2.39.5 From e38e8fc6fe28799c4a5aad2521e5085833597915 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 22 Aug 2009 13:52:03 +0200 Subject: [PATCH 10/16] set marks on save and idle --- .vimrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.vimrc b/.vimrc index b0a86f8..40ad50d 100644 --- a/.vimrc +++ b/.vimrc @@ -1453,6 +1453,15 @@ autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/* " jump to last known position in file (:he last-position-jump) autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g`\"zz" | endif +" leave the w mark whenever a file is written +autocmd BufWrite * normal mw + +" leave the i mark whenever we go idle (after updatetime) +augroup markidle + autocmd CursorHold * normal mi + autocmd CursorHoldI * normal mi +augroup end + " disable list mode when inserting stuff, otherwise keep it enabled, it's " useful (see also setting lcs) augroup listinsert -- 2.39.5 From ac353c7f6879ba6c2bf0fec432a757452b0c497a Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 29 Aug 2009 18:39:43 +0200 Subject: [PATCH 11/16] add words --- .vim/spell/en.utf-8.add | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 1df8153..e604810 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -77,3 +77,7 @@ panelists anonymise panelist anonymising +Jun +Likert +Ubuntu +peercolation -- 2.39.5 From 2dfe83c7844a274ea83df9525d785e0c3b2fbafd Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 5 Sep 2009 11:50:04 +0200 Subject: [PATCH 12/16] commented out disabling of placeholders --- .vim/ftplugin/tex.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vim/ftplugin/tex.vim b/.vim/ftplugin/tex.vim index 4e3bb1e..7d3361f 100644 --- a/.vim/ftplugin/tex.vim +++ b/.vim/ftplugin/tex.vim @@ -1,3 +1,5 @@ let Tex_UsePython = 1 let Tex_FoldedMisc = "preamble,<<<" + +"let g:Imap_UsePlaceHolders = 0 -- 2.39.5 From 7b235fb2438d573493d30481c24ac102d65c99d6 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 5 Sep 2009 11:50:18 +0200 Subject: [PATCH 13/16] disable marking on idle in insert mode --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 40ad50d..2855c1c 100644 --- a/.vimrc +++ b/.vimrc @@ -1459,7 +1459,7 @@ autocmd BufWrite * normal mw " leave the i mark whenever we go idle (after updatetime) augroup markidle autocmd CursorHold * normal mi - autocmd CursorHoldI * normal mi + "autocmd CursorHoldI * normal mi "DISABLED while broken (shifts left) augroup end " disable list mode when inserting stuff, otherwise keep it enabled, it's -- 2.39.5 From 093b8dd3cdfc7f67b743dcc5d08ee1502640ebf2 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 5 Sep 2009 11:50:21 +0200 Subject: [PATCH 14/16] add words --- .vim/spell/en.utf-8.add | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 88bbe83..ce6fa95 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -83,3 +83,7 @@ autotools Genericity lintian Likert +peercolation +trialability +phd +tesseract -- 2.39.5 From 60fb907fadb73fdda7e363b8ec252df32fc1d495 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 5 Sep 2009 12:08:36 +0200 Subject: [PATCH 15/16] properly show colours on errors --- .vim/colors/madduck.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/colors/madduck.vim b/.vim/colors/madduck.vim index 3947d39..b5c45de 100644 --- a/.vim/colors/madduck.vim +++ b/.vim/colors/madduck.vim @@ -29,7 +29,7 @@ if &background == "dark" hi mailQuoted5 ctermfg=darkgreen hi mailQuoted6 ctermfg=magenta - hi Error ctermfg=White ctermbg=Red cterm=reverse term=reverse + hi Error ctermfg=White ctermbg=Red cterm=none term=none hi Todo ctermfg=Black ctermbg=Yellow cterm=standout term=standout else -- 2.39.5 From ec0ef6e223cfeace3d12b9a31b7c17b6ce521c34 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 13 Oct 2009 15:25:47 +0200 Subject: [PATCH 16/16] more words --- .vim/spell/en.utf-8.add | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 56a3f85..4982523 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -8,6 +8,7 @@ anonymised anonymising autotools B +bikeshed blog blogged bo @@ -15,6 +16,8 @@ Boehm BTS c0ffee changelog +chroot +codings cosmopolite cosmopoliteness deadbeef @@ -25,12 +28,14 @@ Debianisation debianised Debian's Delphis +determinist devel diff dpkg EFTE Farquhar Fishbein +FreeBSD freenode Genericity hamm @@ -41,6 +46,7 @@ homophilous homophily Homophily iff +interpretivism IRC Jun learnable @@ -51,6 +57,7 @@ localite madduck mdadm namespace +occasionalist oldstable panelist panelists @@ -59,6 +66,7 @@ Peercolation phd pkg pleonastic +POSIX RC rebase rebases @@ -70,6 +78,7 @@ Schulze screenshot Slackware snapshotted +Solaris svn tarball tarballs @@ -84,5 +93,8 @@ upstream's vcs vi Wichert +wiki workflow workflows +netbooks +Hurd -- 2.39.5