use mutt -Q to query config

[etc/mutt.git] / .mutt / htmldump

diff --git a/.mutt/htmldump b/.mutt/htmldump
index 906bd6dc51f086e094b64abbf05be5ca8fb20df7..c15ecd1c199e8432671a84c2b38a0d3c3eac8c88 100755 (executable)
--- a/.mutt/htmldump
+++ b/.mutt/htmldump
@@ -2,7 +2,7 @@
 
 get_mutt_confvar() {
   local ret;
 
 get_mutt_confvar() {
   local ret;

-  ret=$(mutt -D | sed -rne "s,^${1}(=| is ),,p")
+  ret=$(mutt -Q "$1" | sed -rne "s,\S+(=| is ),,p")

   case "$ret" in
     (set) echo return 0;;
     (unset) echo return 1;;
   case "$ret" in
     (set) echo return 0;;
     (unset) echo return 1;;


@@ -27,6 +27,11 @@ if command -v html2markdown >/dev/null; then
     --decode-errors=replace --images-to-alt - "$2"| \
     sed -re 's,^\\--[[:space:]]+$,-- ,'
 
     --decode-errors=replace --images-to-alt - "$2"| \
     sed -re 's,^\\--[[:space:]]+$,-- ,'
 

+elif command -v pandoc >/dev/null; then
+
+  exec iconv -f "$2" -t utf-8 | pandoc -s -f html -t markdown_mmd \
+    --columns=$WIDTH
+

 elif command -v elinks >/dev/null; then
 
   exec elinks -anonymous -localhost -eval "set document.codepage.assume = '$2'" \
 elif command -v elinks >/dev/null; then
 
   exec elinks -anonymous -localhost -eval "set document.codepage.assume = '$2'" \