Fix order of `other' choice in defcustom :type

* lisp/font-lock.el (font-lock-verbose)
* lisp/image-mode.el (image-auto-resize)
* lisp/gnus/message.el (message-openpgp-header): Arrange for 'other'
to be the last choice.  (Bug#65852)

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index f8815c1698ab1141d89248ca7a86c12b4b34f728..3df63f82fa1b80b45bcd83e7f6eac9ec996d3b0d 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -299,8 +299,8 @@ that match at least one applicable CONDITION are disabled."
   "If non-nil, means show status messages for buffer fontification.
 If a number, only buffers greater than this size have fontification messages."
   :type '(choice (const :tag "never" nil)
-                (other :tag "always" t)
-                (integer :tag "size"))
+                (integer :tag "size")
+                 (other :tag "always" t))
   :group 'font-lock
   :version "24.1")
 \f

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index fe27927be7e341ce86277620eb5ded770fbb59c8..b8ea529d51c0fab2976c6fea9da166a5a1b364c8 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2840,11 +2840,11 @@ will not be inserted."
                        (const :tag "No ID" nil))
                (choice (string :tag "Key")
                        (const :tag "No Key" nil))
-               (choice (other :tag "None" nil)
-                       (const :tag "Unprotected" "unprotected")
+                (choice (const :tag "Unprotected" "unprotected")
                        (const :tag "Sign" "sign")
                        (const :tag "Encrypt" "encrypt")
-                       (const :tag "Sign and Encrypt" "signencrypt"))))
+                        (const :tag "Sign and Encrypt" "signencrypt")
+                        (other :tag "None" nil))))
   :version "28.1")
 
 (defun message-add-openpgp-header ()

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index dce35ff72da8b4bfaab714110d48942c58c43feb..ecc7d73dd9e11565b98de206e0ebbdd6b277e17e 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -69,8 +69,8 @@ Its value should be one of the following:
 Resizing will always preserve the aspect ratio of the image."
   :type '(choice (const :tag "No resizing" nil)
                  (const :tag "Fit to window" fit-window)
-                 (other :tag "Scale down to fit window" t)
-                 (number :tag "Scale factor" 1))
+                 (number :tag "Scale factor" 1)
+                 (other :tag "Scale down to fit window" t))
   :version "29.1"
   :group 'image)