Merge remote-tracking branch 'lenormf/fix-autowrap'
This commit is contained in:
commit
a95937918d
|
@ -3,18 +3,20 @@ decl int autowrap_column 80
|
||||||
|
|
||||||
# If enabled, paragraph formatting will reformat the whole paragraph in which characters are being inserted
|
# If enabled, paragraph formatting will reformat the whole paragraph in which characters are being inserted
|
||||||
# This can potentially break formatting of documents containing markup (e.g. markdown)
|
# This can potentially break formatting of documents containing markup (e.g. markdown)
|
||||||
decl bool autowrap_format_paragraph yes
|
decl bool autowrap_format_paragraph no
|
||||||
# Command to which the paragraphs to wrap will be passed, all occurences of '%c' are replaced with `autowrap_column`
|
# Command to which the paragraphs to wrap will be passed, all occurences of '%c' are replaced with `autowrap_column`
|
||||||
decl str autowrap_fmtcmd 'fold -s -w %c'
|
decl str autowrap_fmtcmd 'fold -s -w %c'
|
||||||
|
|
||||||
def -hidden autowrap-cursor %{ eval -draft %{
|
def -hidden autowrap-cursor %{ eval -save-regs '/"|^@m' %{
|
||||||
try %{
|
try %{
|
||||||
## if the line isn't too long, do nothing
|
## if the line isn't too long, do nothing
|
||||||
exec -draft "<a-x><a-k>^[^\n]{%opt{autowrap_column},}<ret>"
|
exec -draft "<a-x><a-k>^[^\n]{%opt{autowrap_column},}[^\n]<ret>"
|
||||||
|
|
||||||
try %{
|
try %{
|
||||||
|
reg m "%val{selections_desc}"
|
||||||
|
|
||||||
## if we're adding characters past the limit, just wrap them around
|
## if we're adding characters past the limit, just wrap them around
|
||||||
exec "<a-h><a-k>.{%opt{autowrap_column},}<ret>1s(\h+)[^\h]+\'<ret>c<ret><esc>"
|
exec -draft "<a-h><a-k>.{%opt{autowrap_column}}\h*[^\s]*<ret>1s(\h+)[^\h]*\'<ret>c<ret><esc>"
|
||||||
} catch %{
|
} catch %{
|
||||||
## if we're adding characters in the middle of a sentence, use
|
## if we're adding characters in the middle of a sentence, use
|
||||||
## the `fmtcmd` command to wrap the entire paragraph
|
## the `fmtcmd` command to wrap the entire paragraph
|
||||||
|
@ -22,9 +24,12 @@ def -hidden autowrap-cursor %{ eval -draft %{
|
||||||
if [[ "${kak_opt_autowrap_format_paragraph}" = true ]] \
|
if [[ "${kak_opt_autowrap_format_paragraph}" = true ]] \
|
||||||
&& [[ -n "${kak_opt_autowrap_fmtcmd}" ]]; then
|
&& [[ -n "${kak_opt_autowrap_fmtcmd}" ]]; then
|
||||||
format_cmd=$(printf %s "${kak_opt_autowrap_fmtcmd}" \
|
format_cmd=$(printf %s "${kak_opt_autowrap_fmtcmd}" \
|
||||||
| sed -e "s/%c/${kak_opt_autowrap_column}/g" \
|
| sed "s/%c/${kak_opt_autowrap_column}/g")
|
||||||
-e 's/ /<space>/g')
|
printf %s "
|
||||||
printf %s "exec -draft <a-i>p|${format_cmd}<ret>"
|
exec '<a-]>p<a-x><a-j>|${format_cmd}<ret>'
|
||||||
|
try %{ exec s\h+$<ret> d }
|
||||||
|
select '${kak_reg_m}'
|
||||||
|
"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user