Package: mutt-patched
Version: 1.5.20-3
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
thanks for including Steve's nice sidebar-newonly patch.
Unfortunately only one part (setting 'sidebar_newmail_only') seems
to work, the other part (the two additional keypresses) don't. When
starting mutt-patched I get:
Error in /home/gregoa/.mutt/sidebar, line 28: sidebar-prev-new: no such
function in map
Error in /home/gregoa/.mutt/sidebar, line 29: sidebar-next-new: no such
function in map
The relevant lines are:
bind index,pager \ey sidebar-prev-new
bind index,pager \ex sidebar-next-new
Looking at the patch itself I'm a bit surprised that in functions.h
the two new OPs are inadded twice in one but never in the second
struct.
Moving the 'duplicates' from OpMain to OpPager indeed gets rid of the
errors at startup - and the key combinations actually work afterwards
:)
debdiff attached.
Cheers,
gregor
- -- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'oldstable'), (500, 'experimental'),
(500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.31-rc6.200908221440
Locale: LANG=C, lc_ctype=de...@euro (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
Versions of packages mutt-patched depends on:
ii libc6 2.9-26 GNU C Library: Shared libraries
ii libcomerr2 1.41.9-1 common error description library
ii libgdbm3 1.8.3-6+b1 GNU dbm database routines (runtime
ii libgnutls26 2.8.3-3 the GNU TLS library - runtime libr
ii libgpg-error0 1.6-1 library for common error values an
ii libgpgme11 1.2.0-1 GPGME - GnuPG Made Easy
ii libgssapi-krb5-2 1.7dfsg~beta3-1 MIT Kerberos runtime libraries - k
ii libidn11 1.15-1 GNU Libidn library, implementation
ii libk5crypto3 1.7dfsg~beta3-1 MIT Kerberos runtime libraries - C
ii libkrb5-3 1.7dfsg~beta3-1 MIT Kerberos runtime libraries
ii libncursesw5 5.7+20090803-2 shared libraries for terminal hand
ii libsasl2-2 2.1.23.dfsg1-1.1 Cyrus SASL - authentication abstra
ii mutt 1.5.20-3 text-based mailreader supporting M
mutt-patched recommends no packages.
mutt-patched suggests no packages.
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkquf/kACgkQOzKYnQDzz+Q6YwCbB1kbfbDard9uv44lMO9xGQbf
BBEAoJxLAZoYCfUn7Iz+ijqNa2thDU//
=2ozu
-----END PGP SIGNATURE-----
diff -u mutt-1.5.20/debian/changelog mutt-1.5.20/debian/changelog
--- mutt-1.5.20/debian/changelog
+++ mutt-1.5.20/debian/changelog
@@ -1,3 +1,10 @@
+mutt (1.5.20-3.1) unstable; urgency=low
+
+ * Fix mutt-patched/sidebar-newonly; the new functions should be once in both
+ maps.
+
+ -- gregor herrmann <gre...@debian.org> Mon, 14 Sep 2009 19:19:56 +0200
+
mutt (1.5.20-3) unstable; urgency=low
[ Adeodato Simó ]
diff -u mutt-1.5.20/debian/patches/mutt-patched/sidebar-newonly mutt-1.5.20/debian/patches/mutt-patched/sidebar-newonly
--- mutt-1.5.20/debian/patches/mutt-patched/sidebar-newonly
+++ mutt-1.5.20/debian/patches/mutt-patched/sidebar-newonly
@@ -23,17 +23,24 @@
default:
--- a/functions.h
+++ b/functions.h
-@@ -173,6 +173,10 @@
+@@ -173,6 +173,8 @@
{ "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
{ "sidebar-next", OP_SIDEBAR_NEXT, NULL },
{ "sidebar-prev", OP_SIDEBAR_PREV, NULL },
+ { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL},
+ { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL},
-+ { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL},
-+ { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL},
{ "sidebar-open", OP_SIDEBAR_OPEN, NULL },
{ NULL, 0, NULL }
};
+@@ -279,6 +281,8 @@
+ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
+ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
+ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
++ { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL },
++ { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL },
+ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+ { NULL, 0, NULL }
+ };
--- a/init.h
+++ b/init.h
@@ -1956,6 +1956,11 @@
