[mutt] 01/02: upstream/549204-clear-N-on-readonly-imap-folders.patch: to clear the N flag on readonly IMAP mailboxes (Closes: 549204).

[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 9da59adf0ff56d9eaef27df06e5e424b39468e65
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Sep 4 21:45:31 2016 +0100

    upstream/549204-clear-N-on-readonly-imap-folders.patch: to clear the N flag on readonly IMAP mailboxes (Closes: 549204).
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 +
 .../549204-clear-N-on-readonly-imap-folders.patch  | 78 ++++++++++++++++++++++
 3 files changed, 81 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1ae7a34..5b479e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mutt (1.7.0-2) UNRELEASED; urgency=medium
       properly (Closes: 644992).
     + upstream/741213-dsa-elgamal-keys-length.patch: to correctly extract the
       length of DSA and Elgamal keys (Closes: 741213).
+    + upstream/549204-clear-N-on-readonly-imap-folders.patch: to clear the N
+      flag on readonly IMAP mailboxes (Closes: 549204).
   * debian/extra/rc/notmuch.rc: restored the notmuch keybindings
     (Closes: 836148).
 
diff --git a/debian/patches/series b/debian/patches/series
index 6ad8356..fe3859f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ upstream/819196-disable-X-in-message-scoring.patch
 upstream/757141-date-format-length.patch
 upstream/644992-ipv6-literal.patch
 upstream/741213-dsa-elgamal-keys-length.patch
+upstream/549204-clear-N-on-readonly-imap-folders.patch
diff --git a/debian/patches/upstream/549204-clear-N-on-readonly-imap-folders.patch b/debian/patches/upstream/549204-clear-N-on-readonly-imap-folders.patch
new file mode 100644
index 0000000..5dca9d1
--- /dev/null
+++ b/debian/patches/upstream/549204-clear-N-on-readonly-imap-folders.patch
@@ -0,0 +1,78 @@
+Clear N flag on read-only IMAP mailboxes if the user requires so.
+
+Patch created by Julien Danjou <acid at debian.org>, Antonio Radici has added a
+case for OP_MAIN_SET_FLAG and OP_MAIN_CLEAR_FLAG which was not there 7 years
+ago.
+
+Debian bug: http://bugs.debian.org/549204
+Mutt bug: http://bugs.mutt.org/969
+
+--- a/mx.c
++++ b/mx.c
+@@ -893,7 +893,7 @@
+ 
+   ctx->closing = 1;
+ 
+-  if (ctx->readonly || ctx->dontwrite)
++  if (ctx->dontwrite)
+   {
+     /* mailbox is readonly or we don't want to write */
+     mx_fastclose_mailbox (ctx);
+--- a/pager.c
++++ b/pager.c
+@@ -2435,7 +2435,6 @@
+       case OP_PURGE_MESSAGE:
+       case OP_DELETE:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+         /* L10N: CHECK_ACL */
+ 	CHECK_ACL(MUTT_ACL_DELETE, _("Cannot delete message"));
+ 
+@@ -2454,7 +2453,6 @@
+       case OP_MAIN_SET_FLAG:
+       case OP_MAIN_CLEAR_FLAG:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+ 
+ 	if (mutt_change_flag (extra->hdr, (ch == OP_MAIN_SET_FLAG)) == 0)
+ 	  redraw |= REDRAW_STATUS | REDRAW_INDEX;
+@@ -2468,7 +2466,6 @@
+       case OP_DELETE_THREAD:
+       case OP_DELETE_SUBTHREAD:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+         /* L10N: CHECK_ACL */
+ 	CHECK_ACL(MUTT_ACL_DELETE, _("Cannot delete message(s)"));
+ 
+@@ -2589,7 +2586,6 @@
+ 
+       case OP_FLAG_MESSAGE:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+         /* L10N: CHECK_ACL */
+ 	CHECK_ACL(MUTT_ACL_WRITE, "Cannot flag message");
+ 
+@@ -2800,7 +2796,6 @@
+ 
+       case OP_TOGGLE_NEW:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+         /* L10N: CHECK_ACL */
+ 	CHECK_ACL(MUTT_ACL_SEEN, _("Cannot toggle new"));
+ 
+@@ -2820,7 +2815,6 @@
+ 
+       case OP_UNDELETE:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+         /* L10N: CHECK_ACL */
+ 	CHECK_ACL(MUTT_ACL_DELETE, _("Cannot undelete message"));
+ 
+@@ -2837,7 +2831,6 @@
+       case OP_UNDELETE_THREAD:
+       case OP_UNDELETE_SUBTHREAD:
+ 	CHECK_MODE(IsHeader (extra));
+-	CHECK_READONLY;
+         /* L10N: CHECK_ACL */
+ 	CHECK_ACL(MUTT_ACL_DELETE, _("Cannot undelete message(s)"));
+ 

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