From: Lars Ingebrigtsen Date: Fri, 25 Sep 2020 13:15:21 +0000 (+0200) Subject: Fix some defcustom types X-Git-Tag: emacs-28.0.90~5889 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1c33e29d58175e159443babd96f230eb0bb4a88;p=emacs.git Fix some defcustom types * lisp/whitespace.el (whitespace-style): * lisp/gnus/message.el (message-screenshot-command): * lisp/progmodes/compile.el (compilation-transform-file-match-alist): * lisp/progmodes/gdb-mi.el (gdb-default-window-configuration-file): * lisp/progmodes/python.el (python-pdbtrack-exit-command): Fix the defcustom types. * lisp/progmodes/sql.el (sql-password-wallet): Fix the value. --- diff --git a/lisp/erc/erc-status-sidebar.el b/lisp/erc/erc-status-sidebar.el index ab9883665d7..08dc8d6015f 100644 --- a/lisp/erc/erc-status-sidebar.el +++ b/lisp/erc/erc-status-sidebar.el @@ -68,7 +68,8 @@ (defcustom erc-status-sidebar-header-line-format nil "Header line format for the status sidebar." - :type 'string + :type '(choice (const :tag "No header line" nil) + string) :group 'erc-status-sidebar) (defcustom erc-status-sidebar-width 15 diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 4484b95075c..b1147924ffa 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -274,6 +274,7 @@ This can also be a list of the above values." If it is a string, the command will be executed in a sub-shell asynchronously. The compressed face will be piped to this command." :type '(choice string + (const :tag "None" nil) (function-item gnus-display-x-face-in-from) function) :version "27.1" diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 16f47c8d4c1..2ad479b59df 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -307,7 +307,7 @@ any confusion." "Command to take a screenshot. The command should insert a PNG in the current buffer." :group 'message-various - :type '(list string) + :type '(repeat string) :version "28.1") ;;; Start of variables adopted from `message-utils.el'. diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el index 8cd658100fb..21206b683cf 100644 --- a/lisp/gnus/nnselect.el +++ b/lisp/gnus/nnselect.el @@ -257,7 +257,8 @@ Returns either the retrieved header format 'nov or 'headers. If this variable is nil, or if the provided function returns nil, `gnus-retrieve-headers' will be called instead." - :version "28.1" :type '(function) :group 'nnselect) + :version "28.1" + :type '(repeat function)) ;; Gnus backend interface functions. diff --git a/lisp/net/tramp-crypt.el b/lisp/net/tramp-crypt.el index c9788fcff52..3e96daa7b1f 100644 --- a/lisp/net/tramp-crypt.el +++ b/lisp/net/tramp-crypt.el @@ -120,7 +120,7 @@ initializing a new crypted remote directory." "Whether to keep the encfs configuration file in the crypted remote directory." :group 'tramp :version "28.1" - :type 'booleanp) + :type 'boolean) ;;;###tramp-autoload (defvar tramp-crypt-directories nil diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 06bdd1e98da..a408d16e37c 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -64,7 +64,8 @@ If nil, use Emacs default." If the replacement is nil, the file will not be considered an error after all. If not nil, it should be a regexp replacement string." - :type '(repeat (list regexp string)) + :type '(repeat (list regexp (choice (const :tag "No replacement" nil) + string))) :version "27.1") (defvar compilation-filter-hook nil diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 8d6f8af2322..c71574ec3c6 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -643,7 +643,8 @@ and looks under `gdb-window-configuration-directory'. Note that this variable only takes effect when variable `gdb-many-windows' is t." - :type 'string + :type '(choice (const :tag "None" nil) + string) :group 'gdb :version "28.1") diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 7c3b611cd9f..68081b80aa9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3796,7 +3796,7 @@ was `continue'. This behavior slightly differentiates the `continue' command from the `exit' command listed in `python-pdbtrack-exit-command'. See `python-pdbtrack-activate' for pdbtracking session overview." - :type 'list + :type '(repeat string) :version "27.1") (defcustom python-pdbtrack-exit-command '("q" "quit" "exit") @@ -3805,7 +3805,7 @@ After one of this commands is sent to pdb, pdbtracking session is considered over. See `python-pdbtrack-activate' for pdbtracking session overview." - :type 'list + :type '(repeast string) :version "27.1") (defcustom python-pdbtrack-kill-buffers t diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index e554b2b8b0b..814a1ad8a3a 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -838,11 +838,11 @@ host key." (setq w (locate-user-emacs-file (concat "sql-wallet" ext) (concat ".sql-wallet" ext))) (when (file-exists-p w) - (setq wallet w))))) + (setq wallet (list w)))))) "Identification of the password wallet. See `sql-password-search-wallet-function' to understand how this value is used to locate the password wallet." - :type `(plist-get (symbol-plist 'auth-sources) 'custom-type) + :type (plist-get (symbol-plist 'auth-sources) 'custom-type) :version "27.1") (defvar sql-password-search-wallet-function #'sql-auth-source-search-wallet diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 8a1bb8ade87..83551053033 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -445,6 +445,8 @@ See also `whitespace-display-mappings' for documentation." (const :tag "(Face) Lines" lines) (const :tag "(Face) Lines, only overlong part" lines-tail) (const :tag "(Face) NEWLINEs" newline) + (const :tag "(Face) Missing newlines at EOB" + missing-newline-at-eof) (const :tag "(Face) Empty Lines At BOB And/Or EOB" empty) (const :tag "(Face) Indentation SPACEs" indentation::tab) (const :tag "(Face) Indentation TABs"