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

diff --cc lisp/gnus/gnus.el
index 89d5d120549a576edf9215c47f32dbd25d0aa16a,69f2bb27993e6c11ab6e7bb230aaa5e7e045d578..c411ec7deb6eed6676ff5527e022c2a9b7fea4ae
--- 1/lisp/gnus/gnus.el
--- 2/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"