From 3c3daa3508bc16ca9db03e7183e8cbefcb00f65f Mon Sep 17 00:00:00 2001
From: ret2hell <eclipzee@pm.me>
Date: Sat, 16 Jan 2021 22:18:16 +0000
Subject: changed 'gpg --fullgenkey' to the correct command.

---
 bin/mw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/mw')

diff --git a/bin/mw b/bin/mw
index 493a5f2..4716989 100755
--- a/bin/mw
+++ b/bin/mw
@@ -25,7 +25,7 @@ checkbasics() { command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
 	[ -r "$PASSWORD_STORE_DIR/.gpg-id" ] &&
 	"$GPG" --list-secret-keys "$(cat "$PASSWORD_STORE_DIR/.gpg-id")" >/dev/null 2>&1 || {
 	echo "First run \`pass init <yourgpgemail>\` to set up a password archive."
-	echo "(If you don't already have a GPG key pair, first run \`$GPG --fullgenkey\`.)"
+	echo "(If you don't already have a GPG key pair, first run \`$GPG --full-gen-key\`.)"
        	exit 1 ;} ;}
 
 getaccounts() { accounts="$(find -L "$accdir" -type f | grep -o "[0-9]-.*.muttrc" | sed "s/-/: /;s/\.muttrc$//" | sort -n)" ;}
-- 
cgit v1.2.3


From 79bb0437267b55a85bbdcf4f9b635be43091a73f Mon Sep 17 00:00:00 2001
From: Gianni Van Hoecke <gianni@giannivanhoecke.com>
Date: Fri, 22 Jan 2021 20:26:45 +0100
Subject: :bug: Set protocol to `imap` when using ProtonMail

Part 1 of 2 for "Log-on not successful" bug when using ProtonMail.

The curl login check defaults to `imaps` when `protocol` isn't set.
Because ProtonMail isn't using any TLS, we have to use the `imap`
protocol.
The `protocol` variable was never set, so now we set it when the
ProtonMail flag (-p) is set.

Bug mentioned in:
Fixes:
- https://github.com/LukeSmithxyz/mutt-wizard/issues/608
- https://github.com/LukeSmithxyz/mutt-wizard/issues/622
---
 bin/mw | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/mw')

diff --git a/bin/mw b/bin/mw
index 4716989..30aabab 100755
--- a/bin/mw
+++ b/bin/mw
@@ -351,6 +351,7 @@ while getopts "fplhodTYD:y:i:I:s:S:u:a:n:x:m:t:" o; do case "${o}" in
 	t) setact toggle || exit 1 ; cronmin="$OPTARG" ;;
 	T) setact toggle || exit 1 ;;
 	p) echo "NOTE: Protonmail users must install and configure Protonmail Bridge first for the first sync to work."
+		protocol="imap"
 		imap="127.0.0.1"
 		iport="1143"
 		smtp="127.0.0.1"
-- 
cgit v1.2.3


From 5920ca462db40309e927e1d58feb08023968e687 Mon Sep 17 00:00:00 2001
From: Gianni Van Hoecke <gianni@giannivanhoecke.com>
Date: Fri, 22 Jan 2021 20:33:29 +0100
Subject: :bug: Supply imap port to curl login check

Part 2 of 2 for "Log-on not successful" bug when using ProtonMail.

The curl login check uses the imap(s) protocol, which means it will use
the default ports. However, when using ProtonMail, these ports are
different (namely 1143 instead of 993).

We now use the port variable in the curl login command, defaulting to
993 when the port was not overridden.

The port variable was already set when the ProtonMail flag (-p) was set.

Bug mentioned in:
Fixes:
- https://github.com/LukeSmithxyz/mutt-wizard/issues/608
- https://github.com/LukeSmithxyz/mutt-wizard/issues/622
---
 bin/mw | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/mw')

diff --git a/bin/mw b/bin/mw
index 30aabab..67c389d 100755
--- a/bin/mw
+++ b/bin/mw
@@ -236,7 +236,7 @@ Junk
 Trash
 Sent
 Archive" && return 0
-	info="$(curl --location-trusted -s -m 5 --user "$login:$(pass $pass_prefix$fulladdr)" --url "${protocol:-imaps}://$imap")"
+	info="$(curl --location-trusted -s -m 5 --user "$login:$(pass $pass_prefix$fulladdr)" --url "${protocol:-imaps}://$imap:${iport:-993}")"
 	[ -z "$info" ] && echo "Log-on not successful." && return 1
 	mailboxes="$(echo "$info" | sed "s/.*\" //;s/\"//g" | tr -d '
')"
 }
-- 
cgit v1.2.3


From 3589c36a381a776776191752265f926a03275ff2 Mon Sep 17 00:00:00 2001
From: PRESFIL <PRESFIL@users.noreply.github.com>
Date: Sat, 23 Jan 2021 00:29:20 +0300
Subject: Fix: `macro index o` overlapping with next account

When the transition is made from an offline profile to an online
profile, there is still someone else's macro - side effects...
Variables, macros, and so on must be taken-into-account
**symmetrically** with any of the `mutt-wizard`'s profiles.
---
 bin/mw | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/mw')

diff --git a/bin/mw b/bin/mw
index 67c389d..f6fd6c0 100755
--- a/bin/mw
+++ b/bin/mw
@@ -122,6 +122,7 @@ bind index,pager g noop
 bind index,pager M noop
 bind index,pager C noop
 bind index gg first-entry
+unmacro index o
 unmailboxes *
 "
 fi
-- 
cgit v1.2.3