From 381ad6c4cf55c9e74c07cf2c2d361d0fbeee7efc Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Wed, 16 Feb 2022 20:29:12 -0300 Subject: [PATCH] Fix types of some align.el defcustoms (Bug#54048) * lisp/align.el (align-region-heuristic) (align-large-region): Both options can be nil, but the defcustom type didn't allow nil values. (align-rules-list-type): The "Run If" and "Valid" attributes should be functions, but the default value was t. Change it to #'always. --- lisp/align.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/align.el b/lisp/align.el index 2279c659b4..b054b1bac4 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -160,7 +160,8 @@ align-region-heuristic point we should search in looking for a region separator. Larger values can mean slower performance in large files, although smaller values may cause unexpected behavior at times." - :type 'integer + :type '(choice (const :tag "Don't use heuristic when aligning a region" nil) + integer) :group 'align) (defcustom align-highlight-change-face 'highlight @@ -176,7 +177,7 @@ align-highlight-nochange-face (defcustom align-large-region 10000 "If an integer, defines what constitutes a \"large\" region. If nil, then no messages will ever be printed to the minibuffer." - :type 'integer + :type '(choice (const :tag "Align a large region silently" nil) integer) :group 'align) (defcustom align-c++-modes '(c++-mode c-mode java-mode) @@ -356,11 +357,11 @@ align-rules-list-type (cons :tag "Valid" (const :tag "(Return non-nil if rule is valid)" valid) - (function :value t)) + (function :value always)) (cons :tag "Run If" (const :tag "(Return non-nil if rule should run)" run-if) - (function :value t)) + (function :value always)) (cons :tag "Column" (const :tag "(Column to fix alignment at)" column) (choice :value comment-column -- 2.17.1