[mutt] 01/01: neomutt-devel/834448-restore-i-pager-binding.patch: restored the 'i' binding to exit from the pager (Closes: 834448).

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 629edb9c1ee85da3dcc5e401221f8cafb08c397b
Author: Antonio Radici <antonio at debian.org>
Date:   Thu Sep 8 08:40:29 2016 +0100

    neomutt-devel/834448-restore-i-pager-binding.patch: restored the 'i' binding to exit from the pager (Closes: 834448).
---
 debian/changelog                                        |  4 ++--
 debian/patches/debian-specific/Muttrc.patch             |  9 +++------
 .../neomutt-devel/834448-restore-i-pager-binding.patch  | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ceeb638..c8960f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,10 +20,10 @@ mutt (1.7.0-2) UNRELEASED; urgency=medium
     + neomutt-devel/836812-user-agent-temp-fix.patch: hardcode the NeoMutt
       version, it will be fixed in the next NeoMutt release (Closes: 836812).
       (Closes: 569038, 774746, 423931, 599136, 618425).
+    + neomutt-devel/834448-restore-i-pager-binding.patch: restored the 'i'
+      binding to exit from the pager (Closes: 834448).
     + debian-specific/828751-pinentry-gpg2-support.patch: enable gpgme by
       default, delegating all crypto to gnupg (Closes: 96144, 828751, 824832).
-    + debian-specific/Muttrc.patch: restored the 'i' binding to exit from the
-      pager (Closes: 834448).
   * debian/extra/rc/notmuch.rc: restored the notmuch keybindings
     (Closes: 836148).
   * debian/NEWS: added information about GPGME being enabled by default.
diff --git a/debian/patches/debian-specific/Muttrc.patch b/debian/patches/debian-specific/Muttrc.patch
index 1d98a1d..7c4bd1a 100644
--- a/debian/patches/debian-specific/Muttrc.patch
+++ b/debian/patches/debian-specific/Muttrc.patch
@@ -12,7 +12,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
 
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head
-@@ -12,6 +12,37 @@
+@@ -12,6 +12,34 @@
  # Display the fields in this order
  hdr_order date from to cc subject
  
@@ -23,9 +23,6 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
 +# map delete-char to a sane value
 +bind editor     <delete>  delete-char
 +
-+# until 1.7.0 'i' was used to exit from the pager.
-+bind pager       i        exit
-+
 +# some people actually like these settings
 +#set pager_stop
 +#bind pager <up> previous-line
@@ -50,7 +47,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
  
-@@ -23,19 +54,14 @@
+@@ -23,19 +51,14 @@
  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
@@ -72,7 +69,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
  #
  # set hostname=cs.hmc.edu
  
-@@ -47,6 +73,10 @@
+@@ -47,6 +70,10 @@
  # be undone with unmime_lookup.
  mime_lookup application/octet-stream
  
diff --git a/debian/patches/neomutt-devel/834448-restore-i-pager-binding.patch b/debian/patches/neomutt-devel/834448-restore-i-pager-binding.patch
new file mode 100644
index 0000000..bbdacc6
--- /dev/null
+++ b/debian/patches/neomutt-devel/834448-restore-i-pager-binding.patch
@@ -0,0 +1,17 @@
+The NNTP patch overwrote the default keybindings; nntp bindings in nntp.rc did
+overwrite other bindings by default so neomutt decided to disable those,
+unfortunately this keybinding in keymap.c was left there.
+
+Debian bug: http://bugs.debian.org/834448
+Neomutt issue: https://github.com/neomutt/neomutt/issues/133
+
+--- a/keymap.c
++++ b/keymap.c
+@@ -799,6 +799,7 @@
+   km_bindkey ("<enter>", MENU_MAIN, OP_DISPLAY_MESSAGE);
+ 
+   km_bindkey ("x", MENU_PAGER, OP_EXIT);
++  km_bindkey ("i", MENU_PAGER, OP_EXIT);
+   km_bindkey ("<backspace>", MENU_PAGER, OP_PREV_LINE);
+   km_bindkey ("<pagedown>", MENU_PAGER, OP_NEXT_PAGE);
+   km_bindkey ("<pageup>", MENU_PAGER, OP_PREV_PAGE);
diff --git a/debian/patches/series b/debian/patches/series
index 789b423..c884095 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ neomutt-20160827.patch
 neomutt-devel/sensible-browser.patch
 neomutt-devel/832971-reset-xlabel.patch
 neomutt-devel/836812-user-agent-temp-fix.patch
+neomutt-devel/834448-restore-i-pager-binding.patch
 debian-specific/Muttrc.patch
 debian-specific/Md.etc_mailname_gethostbyname.patch
 debian-specific/use_usr_bin_editor.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git