From ce31e726adbb4d24557b3d1ff067cc4c04d94446 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 13 Dec 2017 15:29:24 -0500 Subject: [PATCH] Fixes for defcustoms, prompted by cus-test-opts * lisp/files.el (save-some-buffers-default-predicate): * lisp/time.el (display-time-world-list): * lisp/gnus/gnus-art.el (gnus-article-show-cursor): * lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-names): * lisp/progmodes/verilog-mode.el (verilog-auto-wire-type): * lisp/textmodes/less-css-mode.el (less-css-output-directory) (less-css-output-file-name, less-css-input-file-name): * lisp/vc/emerge.el (emerge-metachars): * lisp/vc/vc-hg.el (vc-hg-symbolic-revision-styles): Fix :types. * lisp/net/newst-backend.el (newsticker-url-list-defaults): Fix url. --- lisp/files.el | 4 +++- lisp/gnus/gnus-art.el | 2 +- lisp/net/newst-backend.el | 2 +- lisp/progmodes/cc-vars.el | 2 +- lisp/progmodes/verilog-mode.el | 8 ++++---- lisp/textmodes/less-css-mode.el | 6 +++--- lisp/time.el | 4 +++- lisp/vc/emerge.el | 6 ++---- lisp/vc/vc-hg.el | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 4b6d4e88acb..90c865782f3 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5195,7 +5195,9 @@ Before and after saving the buffer, this function runs This allows you to stop `save-some-buffers' from asking about certain files that you'd usually rather not save." :group 'auto-save - :type 'function + ;; FIXME nil should not be a valid option, let alone the default, + ;; eg so that add-function can be used. + :type '(choice (const :tag "Default" nil) function) :version "26.1") (defun save-some-buffers (&optional arg pred) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index c130dc1b6c6..e9cc09ce9b8 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -527,7 +527,7 @@ each invocation of the saving commands." "If non-nil, show the cursor in the Article buffer even when not selected." :version "25.1" :group 'gnus-article - :type 'bool) + :type 'boolean) (defcustom gnus-saved-headers gnus-visible-headers "Headers to keep if `gnus-save-all-headers' is nil. diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 0fb347fc4e9..ed60a8a3aea 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -162,7 +162,7 @@ value effective." (defcustom newsticker-url-list-defaults '(("Emacs Wiki" - "http://www.emacswiki.org/cgi-bin/wiki.pl?action=rss" + "https://www.emacswiki.org/emacs?action=rss" nil 3600)) "A customizable list of news feeds to select from. diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 37d6675821e..f7bfe7c672a 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1669,7 +1669,7 @@ this implicitly by reinitializing C/C++/Objc Mode on any buffer)." which optionally have arguments in parentheses, and which expand to nothing. These are recognized by CC Mode only in declarations." :version "26.1" - :type '(regexp :tag "List of names (possibly empty)" string) + :type '(repeat :tag "List of names (possibly empty)" string) :group 'c) (put 'c-noise-macro-with-parens-names 'safe-local-variable #'c-string-list-p) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 10a1edc3ee0..1baac1d4204 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -764,14 +764,14 @@ mode is experimental." :version "24.1" ; rev670 :group 'verilog-mode-actions :type 'boolean) -(put 'verilog-auto-declare-nettype 'safe-local-variable `stringp) +(put 'verilog-auto-declare-nettype 'safe-local-variable 'stringp) (defcustom verilog-auto-wire-comment t "Non-nil indicates to insert to/from comments with `verilog-auto-wire' etc." :version "25.1" :group 'verilog-mode-actions :type 'boolean) -(put 'verilog-auto-wire-comment 'safe-local-variable `verilog-booleanp) +(put 'verilog-auto-wire-comment 'safe-local-variable 'verilog-booleanp) (defcustom verilog-auto-wire-type nil "Non-nil specifies the data type to use with `verilog-auto-wire' etc. @@ -781,8 +781,8 @@ this is generally only appropriate when making a non-SystemVerilog wrapper containing SystemVerilog cells." :version "24.1" ; rev673 :group 'verilog-mode-actions - :type 'string) -(put 'verilog-auto-wire-type 'safe-local-variable `stringp) + :type '(choice (const nil) string)) +(put 'verilog-auto-wire-type 'safe-local-variable 'stringp) (defcustom verilog-auto-endcomments t "Non-nil means insert a comment /* ... */ after `end's. diff --git a/lisp/textmodes/less-css-mode.el b/lisp/textmodes/less-css-mode.el index 387d1c2fd57..c2846ac926b 100644 --- a/lisp/textmodes/less-css-mode.el +++ b/lisp/textmodes/less-css-mode.el @@ -106,7 +106,7 @@ Use \"-x\" to minify output." This path is expanded relative to the directory of the Less file using `expand-file-name', so both relative and absolute paths will work as expected." - :type 'directory) + :type '(choice (const :tag "Same as Less file" nil) directory)) ;;;###autoload (put 'less-css-output-directory 'safe-local-variable 'stringp) @@ -116,7 +116,7 @@ This can be also be set to a full path, or a relative path. If the path is relative, it will be relative to the value of `less-css-output-dir', if set, or the current directory by default." - :type 'file) + :type '(choice (const :tag "Default" nil) file)) (make-variable-buffer-local 'less-css-output-file-name) (defcustom less-css-input-file-name nil @@ -132,7 +132,7 @@ variables. This can be also be set to a full path, or a relative path. If the path is relative, it will be relative to the current directory by default." - :type 'file) + :type '(choice (const nil) file)) ;;;###autoload (put 'less-css-input-file-name 'safe-local-variable 'stringp) (make-variable-buffer-local 'less-css-input-file-name) diff --git a/lisp/time.el b/lisp/time.el index c8726a9a1b0..7f85b866880 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -173,7 +173,9 @@ If the value is t instead of an alist, use the value of `legacy-style-world-list' otherwise." :group 'display-time - :type '(repeat (list string string)) + :type '(choice (const :tag "Default" t) + (repeat :tag "List of zones and labels" + (list (string :tag "Zone") (string :tag "Label")))) :version "23.1") (defun time--display-world-list () diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index 9c25ec43321..3f945bbb2bf 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -3171,11 +3171,9 @@ See also `auto-save-file-name-p'." (setq limit (1+ (match-end 0))))) s) -;; Metacharacters that have to be protected from the shell when executing -;; a diff/diff3 command. (defcustom emerge-metachars nil - "Obsolete, emerge now uses `shell-quote-argument'." - :type 'regexp + "No longer used. Emerge now uses `shell-quote-argument'." + :type '(choice (const nil) regexp) :group 'emerge) (make-obsolete-variable 'emerge-metachars nil "26.1") diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 99c8869ae06..a404626fba2 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -278,7 +278,7 @@ within the repository. If no list entry produces a useful revision, return `nil'." :type '(repeat (choice - (const :tag "Active bookmark" 'bookmark) + (const :tag "Active bookmark" builtin-active-bookmark) (string :tag "Hg template") (function :tag "Custom"))) :version "26.1" -- 2.39.2