commit a20d2e6625392cced400f5983f998bf2673c9d57 (HEAD, refs/remotes/origin/master)
Author: martin rudalics <rudalics@gmx.at>
Date:   Fri Apr 13 07:42:19 2018 +0000

    * lisp/gnus/gnus-art.el (gnus-article-prepare): Fix previous commit,
    in which selecting the article window is not necessary (bug#25526).

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index f8a29ea2e5..ed6e77fb32 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4697,9 +4697,10 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 	    (set-window-point (get-buffer-window (current-buffer)) (point))
 	    (gnus-configure-windows 'article)
 	    ;; Make sure the article begins with the top of the header.
-	    (save-selected-window
-	      (select-window (get-buffer-window gnus-article-buffer))
-	      (goto-char (point-min)))
+	    (let ((window (get-buffer-window gnus-article-buffer)))
+	      (when window
+		(with-current-buffer (window-buffer window)
+		  (set-window-point window (point-min)))))
 	    (gnus-run-hooks 'gnus-article-prepare-hook)
 	    t))))))
 

commit 93678bffe6427b9d83dae032c56a4e480539a4a7
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Fri Apr 13 02:23:49 2018 +0200

    Remove unused local variable

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index f225079577..10d9c47e8d 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1239,8 +1239,7 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
 		    :eww-form eww-form))
 	(options nil)
 	(start (point))
-	(max 0)
-	opelem)
+	(max 0))
     (dolist (elem (dom-non-text-children dom))
       (when (eq (dom-tag elem) 'option)
 	(when (dom-attr elem 'selected)

commit e6c4a0298eb66e9a9dacd67f9b9a13d8aae97c49
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Fri Apr 13 02:21:30 2018 +0200

    Treat 302 redirects as if they were 303 redirects
    
    * lisp/url/url-http.el (url-http-parse-headers): Treat 302 as 303,
    since this is what the standards recommend these days (bug#25703).
    See https://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_Redirection

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index aed0efab01..e2d7a50e29 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -623,6 +623,12 @@ should be shown to the user."
 	    ;; We do not support agent-driven negotiation, so we just
 	    ;; redirect to the preferred URI if one is provided.
 	    nil)
+           (`found			; 302
+	    ;; 302 Found was ambiguously defined in the standards, but
+	    ;; it's now recommended that it's treated like 303 instead
+	    ;; of 307, since that's what most servers expect.
+	    (setq url-http-method "GET"
+		  url-http-data nil))
            (`see-other			; 303
 	    ;; The response to the request can be found under a different
 	    ;; URI and SHOULD be retrieved using a GET method on that

commit 45c4c03f0d55b4bcca499ca6d55a4ebbcd47bbf9
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Fri Apr 13 02:08:40 2018 +0200

    Make eww render <select> elements again
    
    * lisp/net/eww.el (eww-tag-select): Actually render <select>
    elements (bug#25703).

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 9490d31922..f225079577 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1241,12 +1241,7 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
 	(start (point))
 	(max 0)
 	opelem)
-    (if (eq (dom-tag dom) 'optgroup)
-	(dolist (groupelem (dom-children dom))
-	  (unless (dom-attr groupelem 'disabled)
-	    (setq opelem (append opelem (list groupelem)))))
-      (setq opelem (list dom)))
-    (dolist (elem opelem)
+    (dolist (elem (dom-non-text-children dom))
       (when (eq (dom-tag elem) 'option)
 	(when (dom-attr elem 'selected)
 	  (nconc menu (list :value (dom-attr elem 'value))))

commit dd0d2e0fdd7c130255d9cfd83638da63ac9daf04
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Fri Apr 13 01:51:56 2018 +0200

    <label> shouldn't introduce a line break
    
    * lisp/net/shr.el (shr-tag-label): Remove so that labels don't
    break lines (because they shouldn't: They're usually part of a
    selection interface) (bug#30557).

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 08aefd01d0..e743f9d384 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1319,10 +1319,6 @@ ones, in case fg and bg are nil."
     (shr-generic dom)
     (put-text-property start (point) 'display '(raise -0.5))))
 
-(defun shr-tag-label (dom)
-  (shr-generic dom)
-  (shr-ensure-paragraph))
-
 (defun shr-tag-p (dom)
   (shr-ensure-paragraph)
   (shr-generic dom)

commit 306a6f8d435e8283691898552391687aeff4110d
Author: Katsumi Yamaoka <yamaoka@jpl.org>
Date:   Thu Apr 12 23:19:17 2018 +0000

    * lisp/gnus/gnus-art.el (gnus-article-prepare): Make sure the article
    begins with the top of the header (bug#25526).

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 74915a8cda..f8a29ea2e5 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4696,6 +4696,10 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 	      (forward-line -1))
 	    (set-window-point (get-buffer-window (current-buffer)) (point))
 	    (gnus-configure-windows 'article)
+	    ;; Make sure the article begins with the top of the header.
+	    (save-selected-window
+	      (select-window (get-buffer-window gnus-article-buffer))
+	      (goto-char (point-min)))
 	    (gnus-run-hooks 'gnus-article-prepare-hook)
 	    t))))))
 

commit f8db783d097081d8a679a82c3a748ffb7976c4c1
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Fri Apr 13 00:13:17 2018 +0200

    Tweak the eww readability function
    
    * lisp/net/eww.el (eww-highest-readability): Require that the
    readable bit is at least 100 words (bug#30445).

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 66b1767b56..9490d31922 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -731,7 +731,10 @@ the like."
 		   most-negative-fixnum)
 	       (or (dom-attr result :eww-readability-score)
 		   most-negative-fixnum))
-	(setq result highest)))
+        ;; We set a lower bound to how long we accept that the
+        ;; readable portion of the page is going to be.
+        (when (> (length (split-string (dom-texts highest))) 100)
+	  (setq result highest))))
     result))
 
 (defvar eww-mode-map

commit 254f5021aa75c161c964bd5f31b957d69814f38f
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Fri Apr 13 00:11:47 2018 +0200

    (dom-texts): Don't return contents of <script> as text
    
    From: Lars Ingebrigtsen <larsi@gnus.org>
    
    * lisp/dom.el (dom-texts): Don't return contents of <script> as
    text, because it isn't and makes reasoning about textual parts
    more difficult.

diff --git a/lisp/dom.el b/lisp/dom.el
index 8750d7fa86..6045a68d14 100644
--- a/lisp/dom.el
+++ b/lisp/dom.el
@@ -78,15 +78,21 @@ A typical attribute is `href'."
 
 (defun dom-texts (node &optional separator)
   "Return all textual data under NODE concatenated with SEPARATOR in-between."
-  (mapconcat
-   'identity
-   (mapcar
-    (lambda (elem)
-      (if (stringp elem)
-	  elem
-	(dom-texts elem separator)))
-    (dom-children node))
-   (or separator " ")))
+  (if (eq (dom-tag node) 'script)
+      ""
+    (mapconcat
+     'identity
+     (mapcar
+      (lambda (elem)
+        (cond
+         ((stringp elem)
+	  elem)
+         ((eq (dom-tag elem) 'script)
+          "")
+         (t
+	  (dom-texts elem separator))))
+      (dom-children node))
+     (or separator " "))))
 
 (defun dom-child-by-tag (dom tag)
   "Return the first child of DOM that is of type TAG."

commit 3d6fa0b1e085a987588d5b3a54d91abfee42ceea
Author: Basil L. Contovounesios <contovob@tcd.ie>
Date:   Thu Apr 12 23:36:45 2018 +0300

    Support list of default values in completing-read-multiple
    
    * lisp/emacs-lisp/crm.el (completing-read-multiple):
    Consider head of DEF argument when specified as a list,
    as per completing-read-default. (bug#30072)

diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 5aa856f467..3ec0bd81cf 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -263,7 +263,8 @@ with empty strings removed."
 	       (input (read-from-minibuffer
 		       prompt initial-input map
 		       nil hist def inherit-input-method)))
-	  (and def (string-equal input "") (setq input def))
+	  (when (and def (string-equal input ""))
+	    (setq input (if (consp def) (car def) def)))
           ;; Remove empty strings in the list of read strings.
 	  (split-string input crm-separator t)))
     (remove-hook 'choose-completion-string-functions

commit 7643fbb45273c70dafa53a8c844726c9920cd7bd
Author: Jonathan Marten <jjm@keelhaul.me.uk>
Date:   Thu Apr 12 22:23:31 2018 +0200

    From: Lars Ingebrigtsen <larsi@gnus.org>
    
    * lisp/gnus/nnimap.el (nnimap-login): Allow anonymous logins
    (bug#24704).
    
    Copyright-paperwork-exempt: yes

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index a884376efb..01d7948afb 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -522,6 +522,7 @@ textual parts.")
    ((and (not (nnimap-capability "LOGINDISABLED"))
 	 (eq (nnimap-stream-type nnimap-object) 'tls)
 	 (or (null nnimap-authenticator)
+             (eq nnimap-authenticator 'anonymous)
 	     (eq nnimap-authenticator 'login)))
     (nnimap-command "LOGIN %S %S" user password))
    ((and (nnimap-capability "AUTH=CRAM-MD5")
@@ -541,6 +542,7 @@ textual parts.")
       (nnimap-wait-for-response sequence)))
    ((and (not (nnimap-capability "LOGINDISABLED"))
 	 (or (null nnimap-authenticator)
+             (eq nnimap-authenticator 'anonymous)
 	     (eq nnimap-authenticator 'login)))
     (nnimap-command "LOGIN %S %S" user password))
    ((and (nnimap-capability "AUTH=PLAIN")

commit c22677bf00e420e7049bd4fca8e0c05772e973c2
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 22:04:09 2018 +0200

    Default message-forward-as-mime to nil
    
    * doc/misc/gnus.texi (Summary Mail Commands): Ditto.
    
    * doc/misc/message.texi (Forwarding): Note the new default.
    
    * lisp/gnus/message.el (message-forward-as-mime): Default to nil
    since it's been reported that many recipients can't read MIME
    digest forwards (bug#24878).

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 6c165424dd..efda7f20b5 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -5658,8 +5658,7 @@ as an rfc822 @acronym{MIME} section; if the prefix is 3, decode message and
 forward as an rfc822 @acronym{MIME} section; if the prefix is 4, forward message
 directly inline; otherwise, the message is forwarded as no prefix given
 but use the flipped value of (@code{message-forward-as-mime}).  By
-default, the message is decoded and forwarded as an rfc822 @acronym{MIME}
-section.
+default, the forwarded message is inlined into the mail.
 
 @item S m
 @itemx m
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 0a2a6ce49d..1d27ff1c58 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -345,10 +345,10 @@ constructed.  The default value is @code{nil}.
 
 @item message-forward-as-mime
 @vindex message-forward-as-mime
-If this variable is @code{t} (the default), forwarded messages are
-included as inline @acronym{MIME} RFC822 parts.  If it's @code{nil}, forwarded
-messages will just be copied inline to the new message, like previous,
-non @acronym{MIME}-savvy versions of Gnus would do.
+If this variable is @code{t}, forwarded messages are included as
+inline @acronym{MIME} RFC822 parts.  If it's @code{nil} (the default),
+forwarded messages will just be copied inline to the new message, like
+previous, non @acronym{MIME}-savvy versions of Gnus would do.
 
 @item message-forward-before-signature
 @vindex message-forward-before-signature
diff --git a/etc/NEWS b/etc/NEWS
index 2847384a3a..12b72eb25b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -374,6 +374,10 @@ achieve this, add 'message-sign-encrypt-if-all-keys-available' to
 '"foo@bar.com" <foo@bar.com>', Message will elide the repeated "name"
 from the address field in the response.
 
+*** The default of `message-forward-as-mime' has changed from t to nil
+as it has been reported that many recipients can't read forwards that
+are formatted as MIME digests.
+
 * New Modes and Packages in Emacs 27.1
 
 +++
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 250cdc6b12..f7c3ec04ff 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -548,7 +548,7 @@ The provided functions are:
 		(function-item message-forward-subject-name-subject)
 		(repeat :tag "List of functions" function)))
 
-(defcustom message-forward-as-mime t
+(defcustom message-forward-as-mime nil
   "Non-nil means forward messages as an inline/rfc822 MIME section.
 Otherwise, directly inline the old message in the forwarded
 message.
@@ -556,7 +556,7 @@ message.
 When forwarding as MIME, certain MIME-related headers in the
 forwarded message may be removed/altered to ensure that the
 resulting mail is syntactically valid."
-  :version "21.1"
+  :version "27.1"
   :group 'message-forwarding
   :link '(custom-manual "(message)Forwarding")
   :type 'boolean)

commit e7c813e912de9c11438cf91b1fde20d75764697e
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 21:34:37 2018 +0200

    Load w3m in Gnus if required
    
    * lisp/gnus/gnus-art.el (gnus-article-show-images): Ensure that
    w3m is loaded if the user requests that we use it.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b1e23a47ff..74915a8cda 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2217,7 +2217,9 @@ This only works if the article in question is HTML."
     (save-restriction
       (widen)
       (if (eq mm-text-html-renderer 'w3m)
-	  (w3m-toggle-inline-images)
+	  (progn
+	    (require 'w3m)
+	    (w3m-toggle-inline-images))
 	(dolist (region (gnus-find-text-property-region (point-min) (point-max)
 							'image-displayer))
 	  (cl-destructuring-bind (start end function) region

commit 271d8510c42d3f416324ad0e2fed3df2e50e02a4
Author: Tim Landscheidt <tim@tim-landscheidt.de>
Date:   Thu Apr 12 21:31:49 2018 +0200

    Don't autoload function from w3m
    
    * lisp/gnus/gnus-art.el (w3m-toggle-inline-images): Don't use
    autoload for packages that may not be installed (bug#25604).

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c11cf574a3..b1e23a47ff 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2207,7 +2207,7 @@ unfolded."
       (dolist (elem gnus-article-image-alist)
 	(gnus-delete-images (car elem))))))
 
-(autoload 'w3m-toggle-inline-images "w3m")
+(declare-function w3m-toggle-inline-images "w3m")
 
 (defun gnus-article-show-images ()
   "Show any images that are in the HTML-rendered article buffer.

commit 2892b4b99ca31771b16676d1893456310ae2abc4
Author: Oleg Pykhalov <go.wigust@gmail.com>
Date:   Thu Apr 12 21:19:23 2018 +0200

    From: Lars Ingebrigtseb <larsi@gnus.org>
    
    * lisp/gnus/gnus-sum.el (gnus-summary-limit-to-score): Allow limit
    to articles that have a score below the stated number, too
    (bug#30356).

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 1a2f6dd09f..6c165424dd 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -6672,7 +6672,8 @@ Limit the summary buffer to the unseen articles
 @kindex / v @r{(Summary)}
 @findex gnus-summary-limit-to-score
 Limit the summary buffer to articles that have a score at or above some
-score (@code{gnus-summary-limit-to-score}).
+score (@code{gnus-summary-limit-to-score}).  If given a prefix, below
+some score.
 
 @item / p
 @kindex / p @r{(Summary)}
diff --git a/etc/NEWS b/etc/NEWS
index 47c77d1a83..2847384a3a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -175,6 +175,11 @@ you don't need to set them in your early init file.
 
 *** New function 'package-activate-all'.
 
+** Gnus
+
+*** A prefix argument to 'gnus-summary-limit-to-score' will limit reverse
+Limit to articles with score at below.
+
 ** Ecomplete
 *** The ecomplete sorting has changed to a decay-based algorithm.
 This can be controlled by the new `ecomplete-sort-predicate' variable.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index cb26240661..e1789cdd59 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8563,14 +8563,22 @@ Returns how many articles were removed."
 	(gnus-summary-limit articles))
     (gnus-summary-position-point)))
 
-(defun gnus-summary-limit-to-score (score)
-  "Limit to articles with score at or above SCORE."
-  (interactive "NLimit to articles with score of at least: ")
+(defun gnus-summary-limit-to-score (score &optional below)
+  "Limit to articles with score at or above SCORE.
+
+With a prefix argument, limit to articles with score at or below
+SCORE."
+  (interactive (list (string-to-number
+                      (read-string
+                       (format "Limit to articles with score of at %s: "
+                               (if current-prefix-arg "most" "least"))))))
   (let ((data gnus-newsgroup-data)
-	articles)
+        (compare (if (or below current-prefix-arg) #'<= #'>=))
+        articles)
     (while data
-      (when (>= (gnus-summary-article-score (gnus-data-number (car data)))
-		score)
+      (when (funcall compare (gnus-summary-article-score
+                              (gnus-data-number (car data)))
+                     score)
 	(push (gnus-data-number (car data)) articles))
       (setq data (cdr data)))
     (prog1

commit 02f4d79222d9511e03c16540c93b5e26fc2d3ac6
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 21:13:47 2018 +0200

    message-forward-as-mime doc clarification
    
    * lisp/gnus/message.el (message-forward-as-mime): Doc
    clarification (bug#27714).

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5accac7b0b..250cdc6b12 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -550,7 +550,12 @@ The provided functions are:
 
 (defcustom message-forward-as-mime t
   "Non-nil means forward messages as an inline/rfc822 MIME section.
-Otherwise, directly inline the old message in the forwarded message."
+Otherwise, directly inline the old message in the forwarded
+message.
+
+When forwarding as MIME, certain MIME-related headers in the
+forwarded message may be removed/altered to ensure that the
+resulting mail is syntactically valid."
   :version "21.1"
   :group 'message-forwarding
   :link '(custom-manual "(message)Forwarding")

commit 57fbf0cf7bd4a85f2ad6f14aa92494545106b887
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 21:11:12 2018 +0200

    message-forward-ignored-headers doc clarification
    
    * lisp/gnus/message.el (message-forward-ignored-headers): Doc
    clarification (bug#27715).

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 6e4ecb3f76..5accac7b0b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -603,6 +603,9 @@ Done before generating the new subject of a forward."
 
 (defcustom message-forward-ignored-headers "^Content-Transfer-Encoding:\\|^X-Gnus"
   "All headers that match this regexp will be deleted when forwarding a message.
+This variable is only consulted when forwarding \"normally\", not
+when forwarding as MIME or the like.
+
 This may also be a list of regexps."
   :version "21.1"
   :group 'message-forwarding

commit 6499285898c7e1665fa8ef147002daff04a04b93
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 19:36:28 2018 +0200

    Restore point in summary buffer after sorting
    
    * lisp/gnus/gnus-sum.el (gnus-summary-sort): Keep point on the
    current article when sorting (bug#30615).

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index e3cc1928d5..cb26240661 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -11989,7 +11989,8 @@ Argument REVERSE means reverse order."
 
 (defun gnus-summary-sort (predicate reverse)
   "Sort summary buffer by PREDICATE.  REVERSE means reverse order."
-  (let* ((thread (intern (format "gnus-thread-sort-by-%s" predicate)))
+  (let* ((current (gnus-summary-article-number))
+	 (thread (intern (format "gnus-thread-sort-by-%s" predicate)))
 	 (article (intern (format "gnus-article-sort-by-%s" predicate)))
 	 (gnus-thread-sort-functions
 	  (if (not reverse)
@@ -12008,7 +12009,9 @@ Argument REVERSE means reverse order."
     ;; We do the sorting by regenerating the threads.
     (gnus-summary-prepare)
     ;; Hide subthreads if needed.
-    (gnus-summary-maybe-hide-threads)))
+    (gnus-summary-maybe-hide-threads)
+    ;; Restore point.
+    (gnus-summary-goto-subject current)))
 
 ;; Summary saving commands.
 

commit 17174d3f77fe6d5103bfe7e858035a0038010522
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 19:18:26 2018 +0200

    nil is no longer an allowed value for mm-inline-text-html
    
    * doc/misc/emacs-mime.texi (Display Customization): Remove the doc
    for the nil case of mm-inline-text-html.
    
    * doc/misc/mh-e.texi (HTML): Ditto.
    
    * lisp/gnus/mm-view.el (mm-inline-text-html): If no
    mm-text-html-renderer is specified, just insert the raw text
    instead of erroring out (bug#30870).

diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 2c607cc97c..c0b16f30c4 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -404,12 +404,12 @@ variable will cause @samp{text/html} parts to be treated as attachments.
 
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
-This selects the function used to render @acronym{HTML}.  The predefined
-renderers are selected by the symbols @code{shr}, @code{gnus-w3m},
-@code{w3m}@footnote{See @uref{http://emacs-w3m.namazu.org/} for more
-information about emacs-w3m}, @code{links}, @code{lynx},
-@code{w3m-standalone} or @code{html2text}.  If @code{nil} use an
-external viewer.  You can also specify a function, which will be
+This selects the function used to render @acronym{HTML}.  The
+predefined renderers are selected by the symbols @code{shr},
+@code{gnus-w3m}, @code{w3m}@footnote{See
+@uref{http://emacs-w3m.namazu.org/} for more information about
+emacs-w3m}, @code{links}, @code{lynx}, @code{w3m-standalone} or
+@code{html2text}.  You can also specify a function, which will be
 called with a @acronym{MIME} handle as the argument.
 
 @item mm-html-inhibit-images
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index dd8fde494b..1a2f6dd09f 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9806,9 +9806,6 @@ this command passes the @acronym{HTML} content to the browser without
 eliminating these ``web bugs'' you should only use it for mails from
 trusted senders.
 
-If you always want to display @acronym{HTML} parts in the browser, set
-@code{mm-text-html-renderer} to @code{nil}.
-
 This command creates temporary files to pass @acronym{HTML} contents
 including images if any to the browser, and deletes them when exiting
 the group (if you want).
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index b44e503996..7ec9aec016 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -2589,13 +2589,6 @@ centers the output and wraps long lines more than most. It does not
 always handle special characters like @samp{&reg;} or @samp{&ndash;}.
 It does not download images.
 @c -------------------------
-@item @samp{nil}
-This choice obviously requires an external browser. With this setting,
-HTML messages have a button for the body part which you can view with
-@kbd{K v} (@code{mh-folder-toggle-mime-part}). Rendering of special
-characters and handling of remote images depends on your choice of
-browser.
-@c -------------------------
 @item @samp{shr}
 @cindex @samp{shr}
 This choice does not require an external program, but it does require
diff --git a/etc/NEWS b/etc/NEWS
index e3f05f3e0f..47c77d1a83 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -194,6 +194,9 @@ has a search engine.
 *** Splitting mail on common mailing list has been added.  See the
 concept index in the Gnus manual for the `match-list' entry.
 
++++
+*** nil is no longer an allowed value for `mm-text-html-renderer'.
+
 
 ** Htmlfontify
 *** The functions 'hfy-color', 'hfy-color-vals' and
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 595ae58c81..c11cf574a3 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3002,9 +3002,6 @@ articles to verify whether you have read the message.  As
 browser without eliminating these \"web bugs\" you should only
 use it for mails from trusted senders.
 
-If you always want to display HTML parts in the browser, set
-`mm-text-html-renderer' to nil.
-
 This command creates temporary files to pass HTML contents including
 images if any to the browser, and deletes them when exiting the group
 \(if you want)."
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 4192381700..6878aa69c6 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1751,8 +1751,7 @@ score in `gnus-newsgroup-scored' by SCORE."
 	    (mm-display-inline handle)
 	    (goto-char (point-max))))))
 
-    (let (		      ;(mm-text-html-renderer 'w3m-standalone)
-	  (handles (mm-dissect-buffer t)))
+    (let ((handles (mm-dissect-buffer t)))
       (save-excursion
 	(article-goto-body)
 	(delete-region (point) (point-max))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f55a6af802..7ab84c0c83 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -118,8 +118,7 @@
 	((executable-find "w3m") 'gnus-w3m)
 	((executable-find "links") 'links)
 	((executable-find "lynx") 'lynx)
-	((locate-library "html2text") 'html2text)
-	(t nil))
+	((locate-library "html2text") 'html2text))
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
@@ -129,9 +128,8 @@ The defined renderer types are:
 `w3m-standalone': use plain w3m;
 `links': use links;
 `lynx': use lynx;
-`html2text': use html2text;
-nil    : use external viewer (default web browser)."
-  :version "24.1"
+`html2text': use html2text."
+  :version "27.1"
   :type '(choice (const shr)
                  (const gnus-w3m)
                  (const w3m :tag "emacs-w3m")
@@ -139,7 +137,6 @@ nil    : use external viewer (default web browser)."
 		 (const links)
 		 (const lynx)
 		 (const html2text)
-		 (const nil :tag "External viewer")
 		 (function))
   :group 'mime-display)
 
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 75786cd71b..50a927bce2 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -318,6 +318,8 @@
       (if entry
 	  (setq func (cdr entry)))
       (cond
+       ((null func)
+	(mm-insert-inline handle (mm-get-part handle)))
        ((functionp func)
 	(funcall func handle))
        (t

commit 4616ddc1316f9e25429ab932bf87149dc578381d
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 18:12:03 2018 +0200

    Ensure that non-QRESYNC nnimap can proceed after a QRESYNC fail
    
    * lisp/gnus/nnimap.el (nnimap-update-info): If we don't have a
    start-article in the non-QRESYNC case, then the start has to be 1
    (bug#23241).

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index ffe1a47e93..a884376efb 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1544,6 +1544,8 @@ If LIMIT, first try to limit the search to the N last articles."
 	       info existing (nnimap-imap-ranges-to-gnus-ranges vanished) flags)
 	    ;; Do normal non-QRESYNC flag updates.
 	    ;; Update the list of read articles.
+	    (unless start-article
+	      (setq start-article 1))
 	    (let* ((unread
 		    (gnus-compress-sequence
 		     (gnus-set-difference

commit d9d90def6e76e445be965760705b75f9c01b83a5
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 17:50:14 2018 +0200

    Make it possible to exit Gnus without saving .newsrc.eld
    
    * lisp/gnus/gnus-start.el (gnus-save-newsrc-file): Don't error out
    here so that we can proceed with shutting down Gnus without saving
    the .newsrc.eld file when it has been updated externally (bug#23761).

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index bae01aca87..a20a6e727d 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2828,73 +2828,75 @@ If FORCE is non-nil, the .newsrc file is read."
 	  (erase-buffer)
           (gnus-message 5 "Saving %s.eld..." gnus-current-startup-file)
 
-          ;; check timestamp of `gnus-current-startup-file'.eld against
-          ;; `gnus-save-newsrc-file-last-timestamp'
-          (let* ((checkfile (concat gnus-current-startup-file ".eld"))
-                 (mtime (nth 5 (file-attributes checkfile))))
-            (when (and gnus-save-newsrc-file-last-timestamp
-                       (time-less-p gnus-save-newsrc-file-last-timestamp
-                                    mtime))
-              (unless (y-or-n-p
+          ;; Check timestamp of `gnus-current-startup-file'.eld against
+          ;; `gnus-save-newsrc-file-last-timestamp'.
+	  (if (let* ((checkfile (concat gnus-current-startup-file ".eld"))
+                     (mtime (nth 5 (file-attributes checkfile))))
+		(and gnus-save-newsrc-file-last-timestamp
+                     (time-less-p gnus-save-newsrc-file-last-timestamp
+                                  mtime)
+		     (not
+		      (y-or-n-p
                        (format "%s was updated externally after %s, save?"
                                checkfile
                                (format-time-string
-                                "%c"
-                                gnus-save-newsrc-file-last-timestamp)))
-                (error "Couldn't save %s: updated externally" checkfile))))
-
-          (if gnus-save-startup-file-via-temp-buffer
+				"%c"
+				gnus-save-newsrc-file-last-timestamp))))))
+              (gnus-message
+	       4 "Didn't save %s: updated externally"
+	       (concat gnus-current-startup-file ".eld"))
+            (if gnus-save-startup-file-via-temp-buffer
+		(let ((coding-system-for-write gnus-ding-file-coding-system)
+                      (standard-output (current-buffer)))
+                  (gnus-gnus-to-quick-newsrc-format)
+                  (gnus-run-hooks 'gnus-save-quick-newsrc-hook)
+                  (save-buffer)
+                  (setq gnus-save-newsrc-file-last-timestamp
+                        (nth 5 (file-attributes buffer-file-name))))
               (let ((coding-system-for-write gnus-ding-file-coding-system)
-                    (standard-output (current-buffer)))
-                (gnus-gnus-to-quick-newsrc-format)
-                (gnus-run-hooks 'gnus-save-quick-newsrc-hook)
-                (save-buffer)
-                (setq gnus-save-newsrc-file-last-timestamp
-                            (nth 5 (file-attributes buffer-file-name))))
-            (let ((coding-system-for-write gnus-ding-file-coding-system)
-                  (version-control gnus-backup-startup-file)
-                  (startup-file (concat gnus-current-startup-file ".eld"))
-                  (working-dir (file-name-directory gnus-current-startup-file))
-                  working-file
-                  (i -1))
-              ;; Generate the name of a non-existent file.
-              (while (progn (setq working-file
-                                  (format
-                                   (if (and (eq system-type 'ms-dos)
-                                            (not (gnus-long-file-names)))
-                                       "%s#%d.tm#" ; MSDOS limits files to 8+3
-				     "%s#tmp#%d")
-                                   working-dir (setq i (1+ i))))
-                            (file-exists-p working-file)))
-
-              (unwind-protect
-                  (progn
-                    (gnus-with-output-to-file working-file
-		      (gnus-gnus-to-quick-newsrc-format)
-		      (gnus-run-hooks 'gnus-save-quick-newsrc-hook))
-
-                    ;; These bindings will mislead the current buffer
-                    ;; into thinking that it is visiting the startup
-                    ;; file.
-                    (let ((buffer-backed-up nil)
-                          (buffer-file-name startup-file)
-                          (file-precious-flag t)
-                          (setmodes (file-modes startup-file)))
-                      ;; Backup the current version of the startup file.
-                      (backup-buffer)
-
-                      ;; Replace the existing startup file with the temp file.
-                      (rename-file working-file startup-file t)
-                      (gnus-set-file-modes startup-file setmodes)
-                      (setq gnus-save-newsrc-file-last-timestamp
-                            (nth 5 (file-attributes startup-file)))))
-                (condition-case nil
-                    (delete-file working-file)
-                  (file-error nil)))))
-
-	  (gnus-kill-buffer (current-buffer))
-	  (gnus-message
-	   5 "Saving %s.eld...done" gnus-current-startup-file))
+                    (version-control gnus-backup-startup-file)
+                    (startup-file (concat gnus-current-startup-file ".eld"))
+                    (working-dir (file-name-directory gnus-current-startup-file))
+                    working-file
+                    (i -1))
+		;; Generate the name of a non-existent file.
+		(while (progn (setq working-file
+                                    (format
+                                     (if (and (eq system-type 'ms-dos)
+                                              (not (gnus-long-file-names)))
+					 "%s#%d.tm#" ; MSDOS limits files to 8+3
+				       "%s#tmp#%d")
+                                     working-dir (setq i (1+ i))))
+                              (file-exists-p working-file)))
+
+		(unwind-protect
+                    (progn
+                      (gnus-with-output-to-file working-file
+			(gnus-gnus-to-quick-newsrc-format)
+			(gnus-run-hooks 'gnus-save-quick-newsrc-hook))
+
+                      ;; These bindings will mislead the current buffer
+                      ;; into thinking that it is visiting the startup
+                      ;; file.
+                      (let ((buffer-backed-up nil)
+                            (buffer-file-name startup-file)
+                            (file-precious-flag t)
+                            (setmodes (file-modes startup-file)))
+			;; Backup the current version of the startup file.
+			(backup-buffer)
+
+			;; Replace the existing startup file with the temp file.
+			(rename-file working-file startup-file t)
+			(gnus-set-file-modes startup-file setmodes)
+			(setq gnus-save-newsrc-file-last-timestamp
+                              (nth 5 (file-attributes startup-file)))))
+                  (condition-case nil
+                      (delete-file working-file)
+                    (file-error nil)))))
+
+	    (gnus-kill-buffer (current-buffer))
+	    (gnus-message
+	     5 "Saving %s.eld...done" gnus-current-startup-file)))
 	(gnus-dribble-delete-file)
 	(gnus-group-set-mode-line)))))
 

commit f4692fa290e4dca3a636f6872a9b4bc61797b008
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 16:53:07 2018 +0200

    Make nnml save the .overview file when used as an expiry target
    
    * lisp/gnus/nnmail.el (nnmail-expiry-target-group): Always pass in
    the `last' parameter to the acceptance function so that backends
    like nnml save the .overview file (bug#24499).  This may slow down
    some use cases.

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 5083fa2487..aa909cc979 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1900,7 +1900,7 @@ If TIME is nil, then return the cutoff time for oldness instead."
     (unless (eq target 'delete)
       (when (or (gnus-request-group target nil nil (gnus-get-info target))
 		(gnus-request-create-group target))
-	(let ((group-art (gnus-request-accept-article target nil nil t)))
+	(let ((group-art (gnus-request-accept-article target nil t t)))
 	  (when (and (consp group-art)
 		     (cdr group-art))
 	    (gnus-group-mark-article-read target (cdr group-art))))))))

commit c0593bfc7c37d73ef65c4dad4071495200fd76e4
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 16:33:36 2018 +0200

    Clarify Gnus doc string
    
    * lisp/gnus/gnus-cite.el (gnus-article-fill-cited-article):
    Clarify doc string (bug#24578).

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index d7dc0897a5..bbf9e527db 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -481,8 +481,13 @@ Lines matching `gnus-cite-attribution-suffix' and perhaps
 (defun gnus-article-fill-cited-article (&optional width long-lines)
   "Do word wrapping in the current article.
 If WIDTH (the numerical prefix), use that text width when
-filling.  If LONG-LINES, only fill sections that have lines
-longer than the frame width."
+filling.
+
+If LONG-LINES, only fill sections that have lines longer than the
+frame width.
+
+Sections that are heuristically interpreted as not being
+text (i.e., computer code and the like) will not be folded."
   (interactive "P")
   (with-current-buffer gnus-article-buffer
     (let ((buffer-read-only nil)

commit aa9d9e5e100663c38889c8db8989cb9184dfaa08
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 16:32:00 2018 +0200

    Elide XEmacs-relevant comment
    
    * lisp/gnus/gnus-cite.el (gnus-article-fill-cited-article): Remove
    mention of XEmacs, since we no longer support XEmacs.

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 64d3a396f3..d7dc0897a5 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -502,8 +502,6 @@ longer than the frame width."
 		use-hard-newlines)
 	    (unless do-fill
 	      (setq do-fill (gnus-article-foldable-buffer (cdar marks))))
-	    ;; Note: the XEmacs version of `fill-region' inserts a newline
-	    ;; unless the region ends with a newline.
 	    (when do-fill
 	      (if (not long-lines)
 		  (fill-region (point-min) (point-max))

commit 4f95846833649b91d56f23e518aa130a0272be4c
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 15:17:40 2018 +0200

    Make message-simplify-recipients obsolete
    
    * lisp/gnus/message.el (message-simplify-recipients)
    (message-recipients-without-full-name): Made obsolete since
    Message now simplifies all addresses by default.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7079cc73e1..6e4ecb3f76 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8396,6 +8396,9 @@ even if NEW-VALUE is empty."
 	(message-position-on-field header))
       (insert new-value))))
 
+(make-obsolete-variable
+ 'message-recipients-without-full-name
+ "Recipients are simplified by default" "27.1")
 (defcustom message-recipients-without-full-name
   (list "ding@gnus.org"
 	"bugs@gnus.org"
@@ -8411,6 +8414,7 @@ Used in `message-simplify-recipients'."
   :version "23.1" ;; No Gnus
   :group 'message-headers)
 
+(make-obsolete 'message-simplify-recipients nil "27.1")
 (defun message-simplify-recipients ()
   (interactive)
   (dolist (hdr '("Cc" "To"))

commit 9978e88b31a59510a6d24b3ff740172700479f11
Author: Lars Ingebrigtsen <larsi@gnus.org>
Date:   Thu Apr 12 14:57:51 2018 +0200

    Remove repetitions from recipient addresses in Message
    
    * lisp/gnus/message.el (message--alter-repeat-address): New function.
    (message-get-reply-headers): Use it to remove repetitions on the
    form "foo@bar.com" <foo@bar.com>.

diff --git a/etc/NEWS b/etc/NEWS
index 670167165a..e3f05f3e0f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -361,6 +361,11 @@ when the PGP keyring contains a public key for every recipient.  To
 achieve this, add 'message-sign-encrypt-if-all-keys-available' to
 'message-send-hook'.
 
+---
+*** When replying a message that have addresses on the form
+'"foo@bar.com" <foo@bar.com>', Message will elide the repeated "name"
+from the address field in the response.
+
 * New Modes and Packages in Emacs 27.1
 
 +++
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b979e1c504..7079cc73e1 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6867,6 +6867,9 @@ want to get rid of this query permanently.")))
 		    (setq recipients (delq recip recipients))))))))
 
       (setq recipients (message-prune-recipients recipients))
+      (setq recipients
+	    (cl-loop for (id . address) in recipients
+		     collect (cons id (message--alter-repeat-address address))))
 
       ;; Build the header alist.  Allow the user to be asked whether
       ;; or not to reply to all recipients in a wide reply.
@@ -6897,6 +6900,15 @@ want to get rid of this query permanently.")))
 	      (setq recipients (delq recipient recipients))))))))
   recipients)
 
+(defun message--alter-repeat-address (address)
+  "Transform an address on the form \"\"foo@bar.com\"\" <foo@bar.com>\".
+The first bit will be elided if a match is made."
+  (let ((bits (gnus-extract-address-components address)))
+    (if (equal (car bits) (cadr bits))
+	(car bits)
+      ;; Return the original address if we don't have repetition.
+      address)))
+
 (defcustom message-simplify-subject-functions
   '(message-strip-list-identifiers
     message-strip-subject-re
diff --git a/test/lisp/gnus/message-tests.el b/test/lisp/gnus/message-tests.el
index a95559775b..27b8c10dc0 100644
--- a/test/lisp/gnus/message-tests.el
+++ b/test/lisp/gnus/message-tests.el
@@ -145,6 +145,15 @@
       (setq recipients (list person1 person2 person3))
       (should-not (message-all-epg-keys-available-p)))))
 
+(ert-deftest message-alter-repeat-address ()
+  (should (equal (message--alter-repeat-address
+                  "Lars Ingebrigtsen <larsi@gnus.org>")
+                 "Lars Ingebrigtsen <larsi@gnus.org>"))
+
+  (should (equal (message--alter-repeat-address
+                      "\"larsi@gnus.org\" <larsi@gnus.org>")
+                     "larsi@gnus.org")))
+
 (provide 'message-mode-tests)
 
 ;;; message-mode-tests.el ends here