From: Andrea Corallo <akrl@sdf.org>
Date: Sun, 19 Jul 2020 19:39:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~510
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37e0dbc97242a69da9f02039f5635261a307659a;p=emacs.git

Merge remote-tracking branch 'savannah/master' into HEAD
---

37e0dbc97242a69da9f02039f5635261a307659a
diff --cc lisp/gnus/gnus.el
index 89d5d120549,69f2bb27993..c411ec7deb6
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@@ -4126,12 -4140,11 +4140,12 @@@ prompt the user for the name of an NNT
    ;; file.
    (unless (string-match "^Gnus" gnus-version)
      (load "gnus-load" nil t))
 -  (unless (byte-code-function-p (symbol-function 'gnus))
 -    (message "You should byte-compile Gnus")
 +  (unless (or (byte-code-function-p (symbol-function 'gnus))
 +	      (subr-native-elisp-p (symbol-function 'gnus)))
 +    (message "You should compile Gnus")
      (sit-for 2))
    (let ((gnus-action-message-log (list nil)))
-     (gnus-1 arg dont-connect slave)
+     (gnus-1 arg dont-connect child)
      (gnus-final-warning)))
  
  (declare-function debbugs-gnu "ext:debbugs-gnu"