From: Mauro Aranda Date: Sat, 19 Feb 2022 12:34:11 +0000 (+0100) Subject: Fix types of some align.el defcustoms X-Git-Tag: emacs-29.0.90~2231 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f273a504be670d714fe46a067e5edba548443701;p=emacs.git Fix types of some align.el defcustoms * 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 (bug#54048). --- diff --git a/lisp/align.el b/lisp/align.el index 2279c659b43..b054b1bac47 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -160,7 +160,8 @@ string), this heuristic is used to determine how far before and after 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 @@ values may cause unexpected behavior at times." (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 @@ The possible settings for `align-region-separate' are: (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