add folds and comments to mail ftplugin

diff --git a/.config/lazyvim/after/ftplugin/mail.lua b/.config/lazyvim/after/ftplugin/mail.lua
index b3d4005a731debe4d57fc1d4cad2000054a8f180..39eaf3e1639ce29997a05ad1eca1bc287e4f5564 100644 (file)
--- a/.config/lazyvim/after/ftplugin/mail.lua
+++ b/.config/lazyvim/after/ftplugin/mail.lua
@@ -1,3 +1,4 @@
+-- {{{ markdown in mail
 local i, _ = string.find(vim.bo.filetype, "markdown")
 if not i then
   vim.opt_local.filetype = "mail.markdown"
@@ -12,11 +13,17 @@ vim.b.autoformat = false
 
 -- disable Treesitter format expression for Mail
 vim.opt_local.formatexpr = ""
+-- }}}
 
-vim.opt_local.formatoptions:remove("o")
-vim.opt_local.formatoptions:remove("r")
-vim.opt_local.formatoptions:remove("l")
+-- {{{ formatting
+vim.opt_local.formatoptions:remove("o") -- would insert current comment leader for o/O
+vim.opt_local.formatoptions:remove("r") -- would insert current comment leader for <CR>
+vim.opt_local.formatoptions:remove("l") -- would not break lines that were long before insert
 
+vim.opt_local.commentstring = "> %s" -- commenting means quoting in mails
+-- }}}
+
+-- {{{ keymaps
 vim.keymap.set("n", "<leader>m", "", { buffer = true, desc = "mail functions" })
 vim.keymap.set("n", "<leader>ms", "", { buffer = true, desc = "subject manipulation" })
 
@@ -34,6 +41,8 @@ vim.keymap.set(
   { buffer = true, desc = "remove old subjects" }
 )
 
+-- {{{ profiles
+
 vim.keymap.set("n", "<leader>p", "", { buffer = true, desc = "mailplate profiles" })
 
 vim.keymap.set(
@@ -65,6 +74,11 @@ profile_keymap("F10", "mtfk")
 profile_keymap("F11", "sudetia")
 profile_keymap("F12", "default")
 
+-- }}} profiles
+-- }}}
+
+-- {{{ write mail backups
+
 local function write_mail_backup()
   local tmpdir = vim.fn.expand(os.getenv("TMPDIR") or "/tmp") .. "/mail-backups"
   vim.fn.mkdir(tmpdir, "p", "0o700")
@@ -84,7 +98,9 @@ vim.api.nvim_create_autocmd({ "BufWrite" }, {
   buffer = 0,
 })
 
-vim.cmd.runtime("greeting_abbrevs.vim")
+-- }}}
+
+-- {{{ mail area detect
 
 local function mail_area_detect()
   local ts = vim.treesitter
@@ -96,11 +112,11 @@ local function mail_area_detect()
     return
   end
   if node:type():find("^body") ~= nil then
-    vim.opt_local.formatoptions:append("a")
-    vim.opt_local.formatoptions:append("w")
-    vim.opt_local.formatoptions:append("n")
-    vim.opt_local.formatoptions:append("t")
-    vim.opt_local.formatoptions:append("c")
+    vim.opt_local.formatoptions:append("a") -- turn on auto-reflow
+    vim.opt_local.formatoptions:append("w") -- trailing whitespace for format=flowed
+    vim.opt_local.formatoptions:append("n") -- numbered lists
+    vim.opt_local.formatoptions:append("t") -- autowrap with textwidth
+    vim.opt_local.formatoptions:append("c") -- autowrap and insert quote (comment) leader
     vim.w.in_body = true
   else
     vim.opt_local.formatoptions:remove("a")
@@ -119,3 +135,9 @@ vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
   callback = mail_area_detect,
 })
 mail_area_detect()
+
+vim.cmd.runtime("greeting_abbrevs.vim")
+
+-- }}}
+
+-- vim:foldmethod=marker:foldlevel=0

diff --git a/.config/lazyvim/lazy-lock.json b/.config/lazyvim/lazy-lock.json
index 1118c6b8147c6f929594038d9cd5156be370f461..c48191a57f115f2c825d4311cf4a5fb402b686ed 100644 (file)
--- a/.config/lazyvim/lazy-lock.json
+++ b/.config/lazyvim/lazy-lock.json
@@ -8,7 +8,7 @@
   "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "fd50977fce4d5240b910d2b816e71fb726cbbaf7" },
+  "gitsigns.nvim": { "branch": "main", "commit": "ee28ba3e70ecea811b8f6d7b51d81976e94b121c" },
   "grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },