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 ab9883665d7246b7a5b7320f5782e7a0e5babef7..08dc8d6015f10a9b497462683f13423dd42e8f50 100644 (file)
--- 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 4484b95075c6b9f7b3082ad9bb7430cba78740ca..b1147924ffa25106996f92efb110f35432d46e17 100644 (file)
--- 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 16f47c8d4c1881f439860dc07b9336c394b4b1b1..2ad479b59dfeed62fe6445fdfcab805cd0e6e6d9 100644 (file)
--- 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 8cd658100fb741b0468eec5ae8ebf6c1f1dd4342..21206b683cf21b4230fa3c3876cfdc1937fcee1b 100644 (file)
--- 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 c9788fcff527a48322506b19b927c793cee5f74f..3e96daa7b1f7b60073e7f886232deed782f46d1d 100644 (file)
--- 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 06bdd1e98da71c2cfa541e93706b2f14311a22b0..a408d16e37cba3f090e8aedd5c961f34b3caa07e 100644 (file)
--- 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 8d6f8af23222a36eebc9be14721691822a3cddf5..c71574ec3c6aafd068df0489da12061f0a51576c 100644 (file)
--- 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 7c3b611cd9fecfefb446c24939caff4223dad591..68081b80aa94c1581c3f02f6a4728c72f38ea0be 100644 (file)
--- 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 e554b2b8b0b9bcb99c8fcc8679e62c363ee47406..814a1ad8a3a9d033f905ca7c22fcafa0ebc1ce14 100644 (file)
--- 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 8a1bb8ade87c7e2ae86d38ca056ffd854f77eba2..83551053033c28ef7904a0d0df8d10bf8074de1d 100644 (file)
--- 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"