modified completion/_mutt-wizard.zsh, modified share/mutt-temp, modified share/mutt-wizard.muttrc

3 files changed, 42 insertions, 37 deletions

diff --git a/completion/_mutt-wizard.zsh b/completion/_mutt-wizard.zsh
index 18c3e2e..6038323 100644
--- a/completion/_mutt-wizard.zsh
+++ b/completion/_mutt-wizard.zsh
@@ -1,45 +1,50 @@
 #compdef mw
 
 _arguments \
-	'1:flag:->flags' \
-	'*:: :->args'
+    '1:flag:->flags' \
+    '*:: :->args'
 
 case "$state" in
-	flags)
-		local -a opts
-		opts=(
-		'-a:Add an email address'
-		'-l:List email addresses configured'
-		'-d:Remove an already added address'
-		'-D:Force remove account without confirmation'
-		'-y:Sync mail for account by name'
-		'-Y:Sync mail for all accounts'
-		'-t:Toggle automatic mailsync every <number> minutes'
-		'-T:Toggle automatic mailsync every 10 minutes'
-		'-r:order account numbers'
-		)
-		_describe 'flags' opts
-		;;
-	args)
-		case $line[1] in
-			-a)
-				_alternative \
-				'args: :((
-					-u\:"Account login name if not full address"
-					-n\:"Real name to be on the email account"
+    flags)
+        local -a opts
+        opts=(
+            '-a:Add an email address'
+            '-c:Create basic mailboxes for all accounts'
+            '-d:Remove an already added address'
+            '-D:Force remove account without confirmation'
+            '-l:List email addresses configured'
+            '-r:order account numbers'
+            '-t:Toggle automatic mailsync every <number> minutes'
+            '-T:Toggle automatic mailsync every 10 minutes'
+            '-y:Sync mail for account by name'
+            '-Y:Sync mail for all accounts'
+            '-u:Show a registered email account information'
+        )
+            _describe 'flags' opts
+            ;;
+        args)
+            case $line[1] in
+                -a)
+                    _alternative \
+                        'args: :((
+					-f\:"Assume typical English mailboxes without attempting log-on."
 					-i\:"IMAP/POP server address"
 					-I\:"IMAP/POP server port"
+          -m\:"Maximum number of emails to be kept offline (default=0: unlimited)"
+					-n\:"Real name to be on the email account"
+					-N\:"Account login name if not full address"
+					-o\:"Configure address, but keep mail online."
+					-p\:"Add for a POP server instead of IMAP."
+					-P\:"Pass Prefix (prefix of the file where password is stored)"
 					-s\:"SMTP server address"
 					-S\:"SMTP server port"
 					-x\:"Password for account (recommended to be in double quotes)"
-					-P\:"Pass Prefix (prefix of the file where password is stored)"
-					-p\:"Add for a POP server instead of IMAP."
-					-X\:"Delete an account'"'"'s local email too when deleting."
-					-o\:"Configure address, but keep mail online."
-					-f\:"Assume typical English mailboxes without attempting log-on."
-					))'
-				;;
-			-D|-y)
-				_values 'email list' $(mw -l | cut -f2) 2>/dev/null
-		esac
+                    -X\:"Delete an account'"'"'s local email too when deleting."
+            ))'
+                ;;
+            -D|-y)
+                _values 'email list' $(mw -l | cut -f2) 2>/dev/null
+                ;;
+        esac
+        ;;
 esac
diff --git a/share/mutt-temp b/share/mutt-temp
index 32ef07e..fb2f16f 100644
--- a/share/mutt-temp
+++ b/share/mutt-temp
@@ -1,19 +1,19 @@
 # vim: filetype=neomuttrc
 # muttrc file for account $fulladdr
+alias me $realname <$fulladdr>
 set real_name = "$realname"
 set from = "$fulladdr"
 set sendmail = "msmtp -a $fulladdr"
-alias me $realname <$fulladdr>
 set folder = "$folder"
 set header_cache = "$cachedir/$safename/headers"
 set message_cachedir = "$cachedir/$safename/bodies"
 set mbox_type = Maildir
 set hostname = "$hostname"
-source $muttshare/switch.muttrc
 set spool_file = "+INBOX"
 set postponed = "+Drafts"
 set trash = "+Trash"
 set record = "+Sent"
 set status_format = "-%r-$realname: %D [Msgs:%<M?%M/>%m%<n? New:%n>%<o? Old:%o>%<d? Del:%d>%<F? Flag:%F>%<t? Tag:%t>%<p? Post:%p>%<b? Inc:%b>%<l? %l>]---(%<T?%T/>%s/%S)-%>-(%P)---"
+source $muttshare/switch.muttrc
 $extra
 macro index o "<shell-escape>mailsync $fulladdr<enter>" "sync $fulladdr"
diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index f0d25b2..3dfe123 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -189,6 +189,6 @@ color body cyan default "(Good signature)"
 color body brightblack default "^gpg: Good signature .*"
 color body brightyellow default "^gpg: "
 color body brightyellow red "^gpg: BAD signature from.*"
+color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
 mono body bold "^gpg: Good signature"
 mono body bold "^gpg: BAD signature from.*"
-color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"