fix quoting issues when replacing the editor and restoring the setting

diff --git a/keybindings b/keybindings
index 0f8d1a1c9cb55bff9be5e4121a23f9fde120692f..418734b11f7f3f0d006ea2c8e282e14750953861 100644 (file)
--- a/keybindings
+++ b/keybindings
@@ -33,7 +33,7 @@ macro index,pager     Z       "<save-message>=retrain/ham<enter>" "retrain message as ham"
 macro index,pager      \Cb     ':set my_pipe_decode="$pipe_decode"<enter>:set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter>:set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
 
 #TODO this is a hack until switch-profile does not readd headers.
 macro index,pager      \Cb     ':set my_pipe_decode="$pipe_decode"<enter>:set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter>:set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
 
 #TODO this is a hack until switch-profile does not readd headers.

-#macro compose e       ":set my_editor='$editor'<enter>:set editor=sensible-editor<enter><edit-headers>:set editor='$my_editor'<enter>" "invoke normal editor to edit message"
-#macro index,pager     e       ":set my_editor='$editor'<enter>:set editor=sensible-editor<enter><edit>:set editor='$my_editor'<enter>" "invoke normal editor to edit message"
+macro compose  e       ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit-headers>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
+macro index,pager      e       ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"

 
 # vim:sw=12:noet:sts=12:ts=12:ft=muttrc
 
 # vim:sw=12:noet:sts=12:ts=12:ft=muttrc