From adde255e8c19a69a80a7faff93d35767d0d905f8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 29 Dec 2024 17:14:38 -0500 Subject: [PATCH] Merge from GNU Emacs master commit af3bbc83600bec6c8621e1b04437dbfdeb329106 Merge: cb0b6a40570 77243ba5be8 Author: Eli Zaretskii AuthorDate: Sat Dec 28 08:30:31 2024 -0500 Commit: Eli Zaretskii CommitDate: Sat Dec 28 08:30:31 2024 -0500 Merge from origin/emacs-30 77243ba5be8 ; Update version tags of defcustoms --- verilog-mode.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/verilog-mode.el b/verilog-mode.el index 95bb1e4..4f4eca4 100644 --- a/verilog-mode.el +++ b/verilog-mode.el @@ -691,12 +691,14 @@ Set to 0 to have all directives start at the left side of the screen." (defcustom verilog-indent-ignore-multiline-defines t "Non-nil means ignore indentation on lines that are part of a multiline define." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-indent-ignore-multiline-defines 'safe-local-variable #'verilog-booleanp) (defcustom verilog-indent-ignore-regexp nil "Regexp that matches lines that should be ignored for indentation." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-indent-ignore-regexp 'safe-local-variable #'stringp) @@ -748,6 +750,7 @@ Otherwise, line them up." "Non-nil means indent classes inside packages. Otherwise, classes have zero indentation." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-indent-class-inside-pkg 'safe-local-variable #'verilog-booleanp) @@ -761,6 +764,7 @@ Otherwise else is lined up with first character on line holding matching if." (defcustom verilog-align-decl-expr-comments t "Non-nil means align declaration and expressions comments." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-align-decl-expr-comments 'safe-local-variable #'verilog-booleanp) @@ -768,18 +772,21 @@ Otherwise else is lined up with first character on line holding matching if." "Distance (in spaces) between longest declaration/expression and comments. Only works if `verilog-align-decl-expr-comments' is non-nil." :group 'verilog-mode-indent + :version "30.1" :type 'integer) (put 'verilog-align-comment-distance 'safe-local-variable #'integerp) (defcustom verilog-align-assign-expr nil "Non-nil means align expressions of continuous assignments." :group 'verilog-mode-indent + :version "30.1" :type 'boolean) (put 'verilog-align-assign-expr 'safe-local-variable #'verilog-booleanp) (defcustom verilog-align-typedef-regexp nil "Regexp that matches user typedefs for declaration alignment." :group 'verilog-mode-indent + :version "30.1" :type '(choice (regexp :tag "Regexp") (const :tag "None" nil))) (put 'verilog-align-typedef-regexp 'safe-local-variable #'stringp) @@ -787,6 +794,7 @@ Only works if `verilog-align-decl-expr-comments' is non-nil." (defcustom verilog-align-typedef-words nil "List of words that match user typedefs for declaration alignment." :group 'verilog-mode-indent + :version "30.1" :type '(repeat string)) (put 'verilog-align-typedef-words 'safe-local-variable #'listp) @@ -939,6 +947,7 @@ always be saved." (defcustom verilog-fontify-variables t "Non-nil means fontify declaration variables." :group 'verilog-mode-actions + :version "30.1" :type 'boolean) (put 'verilog-fontify-variables 'safe-local-variable #'verilog-booleanp)