diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-10 00:44:01 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-10 00:44:01 +1200 |
commit | 5dc8987fadcc7e2833a1ba3dd058d01328ea173a (patch) | |
tree | ae325a60872effaa5412c089cc45db8951436ae8 | |
parent | Merge branch 'release/v0.49.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-5dc8987fadcc7e2833a1ba3dd058d01328ea173a.tar.gz dotfiles-5dc8987fadcc7e2833a1ba3dd058d01328ea173a.zip |
Merge branch 'release/v0.50.0'v0.50.0
* release/v0.50.0:
Bump VERSION
Update redact_pass.vim plugin again
Update redact_pass.vim plugin
Update copy_linebreak plugin
Set some more 'listchars' options
Replace mail_mutt.vim with mim(1df)
Include .gvimrc patterns for vim filetype
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rwxr-xr-x | bin/mim.mi5 | 12 | ||||
-rw-r--r-- | man/man1/mim.1df | 20 | ||||
m--------- | vim/bundle/copy_linebreak | 0 | ||||
m--------- | vim/bundle/mail_mutt | 0 | ||||
m--------- | vim/bundle/redact_pass | 0 | ||||
-rw-r--r-- | vim/filetype.vim | 2 | ||||
-rw-r--r-- | vim/vimrc | 15 |
12 files changed, 48 insertions, 16 deletions
@@ -61,6 +61,9 @@ bin/med bin/mex bin/mftl bin/mi5 +bin/mim +bin/mim.sh +bin/mim.m4 bin/min bin/mkcp bin/mkmv diff --git a/.gitmodules b/.gitmodules index 82c358ff..e8e15892 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,9 +14,6 @@ [submodule "vim/bundle/insert_suspend_hlsearch"] path = vim/bundle/insert_suspend_hlsearch url = https://sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git -[submodule "vim/bundle/mail_mutt"] - path = vim/bundle/mail_mutt - url = https://sanctum.geek.nz/code/vim-mail-mutt.git [submodule "vim/bundle/markdown_autoformat"] path = vim/bundle/markdown_autoformat url = https://sanctum.geek.nz/code/vim-markdown-autoformat.git @@ -142,6 +142,7 @@ BINS = bin/ap \ bin/med \ bin/mex \ bin/mftl \ + bin/mim \ bin/min \ bin/mkcp \ bin/mkmv \ @@ -218,6 +219,7 @@ BINS = bin/ap \ BINS_M4 = bin/chn.m4 \ bin/dfv.m4 \ bin/edda.m4 \ + bin/mim.m4 \ bin/oii.m4 \ bin/pst.m4 \ bin/swr.m4 \ @@ -228,6 +230,7 @@ BINS_M4 = bin/chn.m4 \ BINS_SH = bin/chn.sh \ bin/dfv.sh \ bin/edda.sh \ + bin/mim.sh \ bin/oii.sh \ bin/pst.sh \ bin/swr.sh \ @@ -297,6 +300,7 @@ clean distclean: bin/chn.sh: bin/chn.m4 include/mktd.m4 bin/dfv.sh: bin/dfv.m4 include/mktd.m4 bin/edda.sh: bin/edda.m4 include/mktd.m4 +bin/mim.sh: bin/mim.m4 include/mktd.m4 bin/oii.sh: bin/oii.m4 include/mktd.m4 bin/pst.sh: bin/pst.m4 include/mktd.m4 bin/swr.sh: bin/swr.m4 include/mktd.m4 @@ -538,6 +538,7 @@ Installed by the `install-bin` target: it exits with success or failure. Good for quick tests. * `mex(1df)` makes given filenames in `$PATH` executable. * `mi5(1df)` is a crude preprocessor for `m4`. +* `mim(1df)` starts an interactive Mutt message with its input. * `mftl(1df)` finds usable-looking targets in makefiles. * `mkcp(1df)` creates a directory and copies preceding arguments into it. * `mkmv(1df)` creates a directory and moves preceding arguments into it. @@ -1,2 +1,2 @@ -tejr dotfiles v0.49.0 -Wed Jun 6 08:41:54 UTC 2018 +tejr dotfiles v0.50.0 +Sat Jun 9 12:43:40 UTC 2018 diff --git a/bin/mim.mi5 b/bin/mim.mi5 new file mode 100755 index 00000000..1c04e185 --- /dev/null +++ b/bin/mim.mi5 @@ -0,0 +1,12 @@ +# Open up Mutt to a new message starting with input + +<% +include(`include/mktd.m4') +%> + +# Direct all input (stdin and files) into a tempfile +tf=$td/out +cat -- "${@:--}" > "$tf" || exit + +# Run Mutt on the tempfile, showing it the TTY for its input +mutt -i "$tf" < /dev/tty diff --git a/man/man1/mim.1df b/man/man1/mim.1df new file mode 100644 index 00000000..e70c7fa5 --- /dev/null +++ b/man/man1/mim.1df @@ -0,0 +1,20 @@ +.TH MIM 1df "June 2018" "Manual page for mim" +.SH NAME +.B mim +\- start a new Mutt message with the input +.SH SYNOPSIS +.B mim +file1 [file2 ...] +.br +curl http://example.net/ | +.B mim +.SH DESCRIPTION +.B mim +takes all its input and puts it into a temporary file for mutt(1) to read with +its -i option, redirecting the terminal input appropriately. This allows you to +concatenate or pipe input straight into a new Mutt message. +.P +The author wrote it so that he could use ! and :! commands in Vim with it, to +email sections of buffers to people conveniently. +.SH AUTHOR +Tom Ryder <tom@sanctum.geek.nz> diff --git a/vim/bundle/copy_linebreak b/vim/bundle/copy_linebreak -Subproject 3448f6ae2bc974af48fb16aaabff85fe1bc250e +Subproject 21c7d37dd2806034dcad7f1ee2334f685874e38 diff --git a/vim/bundle/mail_mutt b/vim/bundle/mail_mutt deleted file mode 160000 -Subproject 3e0e4306641a759758a4eb746708f0efec9cc7e diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass -Subproject 97e019dbe8459d34108212e905b63142ac19410 +Subproject 095a09fe160e9b342c817a5a2df075f9256242c diff --git a/vim/filetype.vim b/vim/filetype.vim index ccb38ca3..d7cafef9 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -175,7 +175,7 @@ augroup filetypedetect \ setfiletype tsv " VimL files autocmd BufNewFile,BufRead - \ *.vim,vimrc,*[._]vimrc,exrc,*[._]exrc + \ *.vim,vimrc,*[._]vimrc,gvimrc,*[._]gvimrc,exrc,*[._]exrc \ setfiletype vim " .viminfo files autocmd BufNewFile,BufRead @@ -363,9 +363,11 @@ nnoremap <silent> <Leader>w :<C-U>set wrap! wrap?<CR> " column with @ symbols instead, which I don't find very helpful set display=lastline -" Clearly show when the start or end of the row does not correspond to the -" start and end of the line -set listchars+=precedes:<,extends:> +" Define list characters +set listchars+=extends:> " Unwrapped text to screen right +set listchars+=precedes:< " Unwrapped text to screen left +set listchars+=tab:>- " Tab characters, preserve width +set listchars+=trail:_ " Trailing spaces " Swap the j/gj and k/gk command pairs so that we move by screen row, not " buffer line, with j/k @@ -428,13 +430,6 @@ nmap ]<Space> <Plug>PutBlankLinesBelow " \b toggles copy-pasteable linebreak settings nmap <Leader>b <Plug>CopyLinebreakToggle -" \m in visual/select mode starts a mail message with the selected lines -vmap <Leader>m <Plug>MailMuttSelected -" \m in normal mode starts a mail message with the current line -nmap <Leader>m <Plug>MailMuttLine -" \M in normal mode starts a mail message with the whole buffer -nmap <Leader>M <Plug>MailMuttBuffer - " \x strips trailing whitespace via a custom plugin nmap <Leader>x <Plug>StripTrailingWhitespace |