Revert "nnimap.el: support additional expunge options"

This reverts commit 4e9baea6aba1633074889339dcc7cdc9d73880d3.

The patch broke fetching new mail:

Debugger entered--Lisp error: (error "Format specifier doesn’t match argument type")
  format("%d .*\n" (t ("OK" ("HIGHESTMODSEQ" "914696") "Expunge" "completed.") ("VANISHED" "1825937") ("0" "RECENT")))
  (looking-at (format "%d .*\n" sequence))
  (not (looking-at (format "%d .*\n" sequence)))
  (progn (while (and (not (bobp)) (progn (forward-line -1) (looking-at "\\*\\|[0-9]+ OK NOOP")))) (not (looking-at (format "%d .*\n" sequence))))

1 files changed, 0 insertions, 10 deletions

diff --git a/etc/NEWS b/etc/NEWS
index e5ee40cbe4b..ca66df62610 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -81,16 +81,6 @@ for '--daemon'.
 * Changes in Emacs 26.1
 
 +++
-** The Gnus user variable 'nnimap-expunge' supports three new values:
-'never' for never expunging messages, 'immediately' for immediately
-expunging deleted messages, and 'on-exit' to expunge deleted articles
-when exiting the group's summary buffer. Setting 'nnimap-expunge' to
-'nil' or 't' is still supported but not recommended, since it may
-result in Gnus expunging all messages that have been flagged as
-deleted by any IMAP client (rather than just those that have been
-deleted by Gnus).
-
-+++
 ** The new function 'mapbacktrace' applies a function to all frames of
 the current stack trace.