Make macros work in pager also

6 files changed, 21 insertions, 20 deletions

diff --git a/.mutt/crypto b/.mutt/crypto
index d6c9def..393820b 100644
--- a/.mutt/crypto
+++ b/.mutt/crypto
@@ -1,8 +1,8 @@
 # -*-muttrc-*-
 #
 # Command formats for gpg.
-# 
-# This version uses gpg-2comp from 
+#
+# This version uses gpg-2comp from
 #   http://70t.de/download/gpg-2comp.tar.gz
 #
 # $Id$
@@ -65,10 +65,10 @@ set pgp_export_command="gpg --no-verbose --export --armor %r"
 set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
 
 # read in the public key ring
-set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" 
+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r"
 
 # read in the secret key ring
-set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
 
 # fetch keys
 # set pgp_getkeys_command="pkspxycwrap %r"
diff --git a/.mutt/id_imperial b/.mutt/id_imperial
index db5cb1f..d4b828d 100644
--- a/.mutt/id_imperial
+++ b/.mutt/id_imperial
@@ -6,6 +6,6 @@ set record    = "+Imperial/Imperial.sent"
 set postponed = "+Imperial/Imperial.drafts"
 set trash     = "+Imperial/Imperial.bin"
 
-macro index gs "<change-folder> $record<enter>"
-macro index gd "<change-folder> $postponed<enter>"
-macro index gb "<change-folder> $trash<enter>"
+macro index,pager gs "<change-folder> $record<enter>"
+macro index,pager gd "<change-folder> $postponed<enter>"
+macro index,pager gb "<change-folder> $trash<enter>"
diff --git a/.mutt/id_informal b/.mutt/id_informal
index 9cc09cf..7dc962e 100644
--- a/.mutt/id_informal
+++ b/.mutt/id_informal
@@ -6,6 +6,6 @@ set record    = "+Informal/Informal.sent"
 set postponed = "+Informal/Informal.drafts"
 set trash     = "+Informal/Informal.bin"
 
-macro index gs "<change-folder> $record<enter>"
-macro index gd "<change-folder> $postponed<enter>"
-macro index gb "<change-folder> $trash<enter>"
+macro index,pager gs "<change-folder> $record<enter>"
+macro index,pager gd "<change-folder> $postponed<enter>"
+macro index,pager gb "<change-folder> $trash<enter>"
diff --git a/.mutt/id_main b/.mutt/id_main
index a89f1ff..1a31d9f 100644
--- a/.mutt/id_main
+++ b/.mutt/id_main
@@ -6,6 +6,6 @@ set record    = "+Main/Main.sent"
 set postponed = "+Main/Main.drafts"
 set trash     = "+Main/Main.bin"
 
-macro index gs "<change-folder> $record<enter>"
-macro index gd "<change-folder> $postponed<enter>"
-macro index gb "<change-folder> $trash<enter>"
+macro index,pager gs "<change-folder> $record<enter>"
+macro index,pager gd "<change-folder> $postponed<enter>"
+macro index,pager gb "<change-folder> $trash<enter>"
diff --git a/.mutt/id_private b/.mutt/id_private
index f38dd7e..b82d298 100644
--- a/.mutt/id_private
+++ b/.mutt/id_private
@@ -6,6 +6,6 @@ set record    = "+Private/Private.sent"
 set postponed = "+Private/Private.drafts"
 set trash     = "+Private/Private.bin"
 
-macro index gs "<change-folder> $record<enter>"
-macro index gd "<change-folder> $postponed<enter>"
-macro index gb "<change-folder> $trash<enter>"
+macro index,pager gs "<change-folder> $record<enter>"
+macro index,pager gd "<change-folder> $postponed<enter>"
+macro index,pager gb "<change-folder> $trash<enter>"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 0f71a80..098e0cf 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -19,6 +19,7 @@ set realname = "Urbain Vaes"
 set reverse_alias
 set sort = reverse-date
 set weed
+set fcc_clear
 unset markers
 
 # Encryption
@@ -55,10 +56,10 @@ set editor="vim --noplugin"
 set include=yes
 
 # Macros
-macro index gm "<change-folder> +Main/Main<enter>" 
-macro index gp "<change-folder> +Private/Private<enter>" 
-macro index gi "<change-folder> +Informal/Informal<enter>" 
-macro index gw "<change-folder> +Imperial/Imperial<enter>" 
+macro index,pager gm "<change-folder> +Main/Main<enter>" 
+macro index,pager gp "<change-folder> +Private/Private<enter>" 
+macro index,pager gi "<change-folder> +Informal/Informal<enter>" 
+macro index,pager gw "<change-folder> +Imperial/Imperial<enter>" 
 
 # Key bindings
 bind index,pager \Cf next-page