6 files changed, 40 insertions, 42 deletions

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 4363860eac8..c53f81fe026 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1913,7 +1913,8 @@ increase the score of each group you read."
   "," gnus-summary-best-unread-article
   "[" gnus-summary-prev-unseen-article
   "]" gnus-summary-next-unseen-article
-  "\M-s" gnus-summary-search-article-forward
+  "\M-s\M-s" gnus-summary-search-article-forward
+  "\M-s\M-r" gnus-summary-search-article-backward
   "\M-r" gnus-summary-search-article-backward
   "\M-S" gnus-summary-repeat-search-article-forward
   "\M-R" gnus-summary-repeat-search-article-backward
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ab625be9e37..07ff4890385 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2751,16 +2751,17 @@ OpenPGP header will be left out.  If all the values are nil,
 or `message-openpgp-header' is itself nil, the OpenPGP header
 will not be inserted."
   :type '(choice
-          (const nil :tag "Don't add OpenPGP header")
-          (list (choice (string :tag "ID")
-                        (const nil :tag "No ID"))
+          (const :tag "Don't add OpenPGP header" nil)
+          (list :tag "Use OpenPGP header"
+                (choice (string :tag "ID")
+                        (const :tag "No ID" nil))
                 (choice (string :tag "Key")
-                        (const nil :tag "No Key"))
-                (choice (other nil :tag "None")
-                        (const "unprotected" :tag "Unprotected")
-                        (const "sign" :tag "Sign")
-                        (const "encrypt" :tag "Encrypt")
-                        (const "signencrypt" :tag "Sign and Encrypt"))))
+                        (const :tag "No Key" nil))
+                (choice (other :tag "None" nil)
+                        (const :tag "Unprotected" "unprotected")
+                        (const :tag "Sign" "sign")
+                        (const :tag "Encrypt" "encrypt")
+                        (const :tag "Sign and Encrypt" "signencrypt"))))
   :version "28.1")
 
 (defun message-add-openpgp-header ()
@@ -2768,32 +2769,34 @@ will not be inserted."
 
 Header will be constructed as specified in `message-openpgp-header'.
 
-Consider adding this function to `message-send-hook'."
+Consider adding this function to `message-header-setup-hook'"
   ;; See https://tools.ietf.org/html/draft-josefsson-openpgp-mailnews-header
   (when (and message-openpgp-header
              (or (nth 0 message-openpgp-header)
                  (nth 1 message-openpgp-header)
                  (nth 2 message-openpgp-header)))
-    (with-temp-buffer
-      (insert "OpenPGP: ")
-      ;; add ID
-      (let (need-sep)
-        (when (nth 0 message-openpgp-header)
-          (insert "id=" (nth 0 message-openpgp-header))
-          (setq need-sep t))
-        ;; add URL
-        (when (nth 1 message-openpgp-header)
-          (when need-sep (insert "; "))
-          (if (string-match-p ";")
-              (insert "url=\"" (nth 1 message-openpgp-header) "\"")
-            (insert "url=\"" (nth 1 message-openpgp-header) "\""))
-          (setq need-sep t))
-        ;; add preference
-        (when (nth 2 message-openpgp-header)
-          (when need-sep (insert "; "))
-          (insert "preference=" (nth 2 message-openpgp-header))))
-      ;; insert header
-      (message-add-header (buffer-string)))))
+    (message-add-header
+     (with-temp-buffer
+       (insert "OpenPGP: ")
+       ;; add ID
+       (let (need-sep)
+         (when (nth 0 message-openpgp-header)
+           (insert "id=" (nth 0 message-openpgp-header))
+           (setq need-sep t))
+         ;; add URL
+         (when (nth 1 message-openpgp-header)
+           (when need-sep (insert "; "))
+           (if (string-match-p ";")
+               (insert "url=\"" (nth 1 message-openpgp-header) "\"")
+             (insert "url=\"" (nth 1 message-openpgp-header) "\""))
+           (setq need-sep t))
+         ;; add preference
+         (when (nth 2 message-openpgp-header)
+           (when need-sep (insert "; "))
+           (insert "preference=" (nth 2 message-openpgp-header))))
+       ;; insert header
+       (buffer-string)))
+    (message-sort-headers)))
 
 
 
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 4754f37a2da..acddb300339 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -329,7 +329,6 @@ Whether the passphrase is cached at all is controlled by
   (autoload 'epg-verify-string "epg")
   (autoload 'epg-sign-string "epg")
   (autoload 'epg-encrypt-string "epg")
-  (autoload 'epg-passphrase-callback-function "epg")
   (autoload 'epg-context-set-passphrase-callback "epg")
   (autoload 'epg-sub-key-fingerprint "epg")
   (autoload 'epg-configuration "epg-config")
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 8be1b84e52f..88864ea3579 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -242,7 +242,6 @@ Whether the passphrase is cached at all is controlled by
 (defvar epg-user-id-alist)
 
 (autoload 'epg-make-context "epg")
-(autoload 'epg-passphrase-callback-function "epg")
 (autoload 'epa-select-keys "epa")
 (autoload 'epg-list-keys "epg")
 (autoload 'epg-context-set-armor "epg")
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index d1d150ad2ee..45c9bbfe905 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -712,7 +712,6 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 (autoload 'epg-verify-string "epg")
 (autoload 'epg-sign-string "epg")
 (autoload 'epg-encrypt-string "epg")
-(autoload 'epg-passphrase-callback-function "epg")
 (autoload 'epg-context-set-passphrase-callback "epg")
 (autoload 'epg-key-sub-key-list "epg")
 (autoload 'epg-sub-key-capability "epg")
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index d41f32801ee..5504a520783 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -56,14 +56,11 @@
 
 (defvar smiley-data-directory)
 
-(defcustom smiley-style
-  (if (and (fboundp 'face-attribute)
-           ;; In batch mode, attributes can be unspecified.
-           (condition-case nil
-               (>= (face-attribute 'default :height) 160)
-             (error nil)))
-      'medium
-    'low-color)
+;; In batch mode, attributes can be unspecified.
+(defcustom smiley-style (if (ignore-errors
+                              (>= (face-attribute 'default :height) 160))
+                            'medium
+                          'low-color)
   "Smiley style."
   :type '(choice (const :tag "small, 3 colors" low-color)  ;; 13x14
                  (const :tag "medium, ~10 colors" medium)  ;; 16x16