Merge emacs bug fixes from release

diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmuch-mutt
index b47b36514a7d97a0a2c0a592b1c6155ef1599739..97fb2d85160cb9a495de68c31103671beeae3fc0 100755 (executable)
--- a/contrib/notmuch-mutt/notmuch-mutt
+++ b/contrib/notmuch-mutt/notmuch-mutt
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # notmuch-mutt - notmuch (of a) helper for Mutt
 #