From b2d5fcecec57b6c2c7f26fdc2b070c14c7eac112 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Sun, 10 Sep 2023 10:45:04 -0300 Subject: [PATCH] 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) --- lisp/font-lock.el | 4 ++-- lisp/gnus/message.el | 6 +++--- lisp/image-mode.el | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index f8815c1698a..3df63f82fa1 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -299,8 +299,8 @@ font-lock-verbose "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") diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index fe27927be7e..b8ea529d51c 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2840,11 +2840,11 @@ message-openpgp-header (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 dce35ff72da..ecc7d73dd9e 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -69,8 +69,8 @@ image-auto-resize 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) -- 2.34.1