Make some defcustom types more restrictive

* lisp/abbrev.el (abbrev-suggest-hint-threshold):
* lisp/bookmark.el (bookmark-bmenu-file-column)
(bookmark-menu-length):
* lisp/buff-menu.el (Buffer-menu-size-width)
(Buffer-menu-mode-width):
* lisp/calendar/calendar.el (calendar-week-start-day)
(calendar-intermonth-spacing, calendar-column-width)
(calendar-day-digit-width):
* lisp/calc/calc.el (calc-undo-length):
* lisp/calendar/timeclock.el (timeclock-workday):
* lisp/comint.el (comint-buffer-maximum-size)
(comint-input-ring-size):
* lisp/doc-view.el (doc-view-resolution, doc-view-image-width):
* lisp/emacs-lisp/bytecomp.el (byte-compile-docstring-max-column):
* lisp/emacs-lisp/comp.el (native-comp-debug)
(native-comp-verbose, native-comp-async-jobs-number):
* lisp/emacs-lisp/package.el (package-name-column-width)
(package-version-column-width, package-status-column-width)
(package-archive-column-width):
* lisp/eshell/esh-mode.el (eshell-buffer-maximum-lines):
* lisp/frame.el (blink-cursor-blinks):
* lisp/info.el (Info-breadcrumbs-depth):
* lisp/jit-lock.el (jit-lock-chunk-size):
* lisp/kmacro.el (kmacro-ring-max):
* lisp/menu-bar.el (yank-menu-length, yank-menu-max-items):
* lisp/midnight.el (clean-buffer-list-delay-general)
(clean-buffer-list-delay-special):
* lisp/net/dictionary.el (dictionary-port)
(dictionary-proxy-port):
* lisp/net/ldap.el (ldap-default-port):
* lisp/net/pop3.el (pop3-port, pop3-stream-length):
* lisp/net/rcirc.el (rcirc-default-port):
* lisp/net/sieve-manage.el (sieve-manage-default-port):
* lisp/play/spook.el (spook-phrase-default-count):
* lisp/play/tetris.el (tetris-buffer-width)
(tetris-buffer-height, tetris-width, tetris-height)
(tetris-top-left-x, tetris-top-left-y):
* lisp/profiler.el (profiler-sampling-interval):
* lisp/progmodes/sql.el (sql-port):
* lisp/recentf.el (recentf-max-menu-items):
* lisp/strokes.el (strokes-grid-resolution):
* lisp/tab-bar.el (tab-bar-tab-name-truncated-max):
* lisp/term/xterm.el (xterm-max-cut-length):
* lisp/time.el (display-time-interval, world-clock-timer-second):
* lisp/url/url-cache.el (url-cache-expire-time):
* lisp/url/url-cookie.el (url-cookie-save-interval):
* lisp/url/url-history.el (url-history-save-interval):
* lisp/url/url-queue.el (url-queue-parallel-processes)
(url-queue-timeout):
* lisp/url/url-vars.el (url-max-password-attempts)
(url-max-redirections):
* lisp/vc/emerge.el (emerge-min-visible-lines):
* lisp/vc/vc.el (vc-log-show-limit):
* lisp/window.el (window-min-height, window-min-width):
* lisp/winner.el (winner-ring-size): Use :type natnum.

* lisp/savehist.el (savehist-file-modes): Fix setting to nil value and
use :type natnum.

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index e875d77faae4f1854e871bca6eeca1359e8edc54..21aa3311d6fdcb1c1f4a0b346c833cb77667bda0 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -885,8 +885,8 @@ longer than the abbrev, the benefit of informing the user is not
 significant.  If you always want to be informed about existing
 abbrevs for the text you type, set this value to zero or less.
 This setting only applies if `abbrev-suggest' is non-nil."
-    :type 'number
-    :version "28.1")
+  :type 'natnum
+  :version "28.1")
 
 (defun abbrev--suggest-get-active-tables-including-parents ()
   "Return a list of all active abbrev tables, including parent tables."

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 7138822447c181c76d08c53b773762440fc065e5..b2130557dcce0f9ee4570f8e034aa36865fe7572 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -160,7 +160,7 @@ This includes the annotations column.")
 (defcustom bookmark-bmenu-file-column 30
   "Column at which to display filenames in a buffer listing bookmarks.
 You can toggle whether files are shown with \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-toggle-filenames]."
-  :type 'integer)
+  :type 'natnum)
 
 
 (defcustom bookmark-bmenu-toggle-filenames t
@@ -174,7 +174,7 @@ A non-nil value may result in truncated bookmark names."
 
 (defcustom bookmark-menu-length 70
   "Maximum length of a bookmark name displayed on a popup menu."
-  :type 'integer)
+  :type 'natnum)
 
 ;; FIXME: Is it really worth a customization option?
 (defcustom bookmark-search-delay 0.2

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 179cc5484cdb739e7cf92228e20e1daa0caf2eee..539ef673f0bb4a23f93bb464ecdeb29788b0bcbf 100644 (file)
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -92,13 +92,13 @@ number."
 
 (defcustom Buffer-menu-size-width 7
   "Width of buffer size column in the Buffer Menu."
-  :type 'number
+  :type 'natnum
   :group 'Buffer-menu
   :version "24.3")
 
 (defcustom Buffer-menu-mode-width 16
   "Width of mode name column in the Buffer Menu."
-  :type 'number
+  :type 'natnum
   :group 'Buffer-menu)
 
 (defcustom Buffer-menu-use-frame-buffer-list t

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index b03dcfeb5b7289e8c958791c2c5c733411630f56..254c703ee220ded1e0d667dfc5221b929add8941 100644 (file)
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -412,7 +412,7 @@ and deleted by `calc-pop'."
 
 (defcustom calc-undo-length 100
   "The number of undo steps that will be preserved when Calc is quit."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom calc-highlight-selections-with-faces nil
   "If non-nil, use a separate face to indicate selected sub-formulas.

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 9a77ae72d02ea77d90e1290458f410ab1fc4aa8e..0d9e6976443f09165b57755c7571ab0ac4ae91dd 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -211,7 +211,7 @@ If you change this variable directly (without using customize)
 after starting `calendar', you should call `calendar-redraw' to
 update the calendar display to reflect the change, otherwise
 movement commands will not work correctly."
-  :type 'integer
+  :type 'natnum
   ;; Change the initialize so that if you reload calendar.el, it will not
   ;; cause a redraw.
   :initialize 'custom-initialize-default
@@ -511,7 +511,7 @@ Then redraw the calendar, if necessary."
   :initialize #'custom-initialize-default
   :set (lambda (sym val)
          (calendar-set-layout-variable sym val 1))
-  :type 'integer
+  :type 'natnum
   :version "23.1")
 
 ;; FIXME calendar-month-column-width?
@@ -520,7 +520,7 @@ Then redraw the calendar, if necessary."
   :initialize #'custom-initialize-default
   :set (lambda (sym val)
          (calendar-set-layout-variable sym val 3))
-  :type 'integer
+  :type 'natnum
   :version "23.1")
 
 (defun calendar-day-header-construct (&optional width)
@@ -553,7 +553,7 @@ Must be at least one less than `calendar-column-width'."
   :initialize #'custom-initialize-default
   :set (lambda (sym val)
          (calendar-set-layout-variable sym val 2))
-  :type 'integer
+  :type 'natnum
   :version "23.1")
 
 (defcustom calendar-intermonth-header nil

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 1c6a557a0d3b6333c2ac8f31efad3cbc6bdec80b..7bdaf7ceff6b284e13ad85be5a8148cd5c57b535 100644 (file)
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -86,7 +86,7 @@
 
 (defcustom timeclock-workday (* 8 60 60)
   "The length of a work period in seconds."
-  :type 'integer)
+  :type 'natnum)
 
 (defvar timeclock--previous-workday nil)
 

diff --git a/lisp/comint.el b/lisp/comint.el
index 4fc1ffcf0cd3d0581b993daef2992238db651521..7e22aa78fcece9eeb0e738f2753056c88e88cba7 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -330,12 +330,12 @@ This variable is buffer-local in all Comint buffers."
   "The maximum size in lines for Comint buffers.
 Comint buffers are truncated from the top to be no greater than this number, if
 the function `comint-truncate-buffer' is on `comint-output-filter-functions'."
-  :type 'integer
+  :type 'natnum
   :group 'comint)
 
 (defcustom comint-input-ring-size 500
   "Size of the input history ring in `comint-mode'."
-  :type 'integer
+  :type 'natnum
   :group 'comint
   :version "23.2")
 

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 63be1b16f3d5317303f12c0fb06f2cf2088df255..25c476b99baacc6697213fab77d66d6e0f4007f3 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -225,7 +225,7 @@ are available (see Info node `(emacs)Document View')"
 (defcustom doc-view-resolution 100
   "Dots per inch resolution used to render the documents.
 Higher values result in larger images."
-  :type 'number)
+  :type 'natnum)
 
 (defvar doc-view-doc-type nil
   "The type of document in the current buffer.
@@ -301,7 +301,7 @@ scaling."
 Has only an effect if `doc-view-scale-internally' is non-nil and support for
 scaling is compiled into Emacs."
   :version "24.1"
-  :type 'number)
+  :type 'natnum)
 
 (defcustom doc-view-dvipdfm-program "dvipdfm"
   "Program to convert DVI files to PDF.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6545c8d961dd3bba32fc1e2d05cdf00b4eb5a898..5ef517d7e325e20990e4b779a24250a863e2d1c1 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1725,8 +1725,8 @@ The byte-compiler will emit a warning for documentation strings
 containing lines wider than this.  If `fill-column' has a larger
 value, it will override this variable."
   :group 'bytecomp
-  :type 'integer
-  :safe #'integerp
+  :type 'natnum
+  :safe #'natnump
   :version "28.1")
 
 (define-obsolete-function-alias 'byte-compile-docstring-length-warn

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 2109aa9923a98b2edeae26056572a6300094cbc5..73285e0f24d23955aa4400d5920a1d78242933d8 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -63,7 +63,7 @@ This is intended for debugging the compiler itself.
   2 emit debug symbols and dump pseudo C code.
   3 emit debug symbols and dump: pseudo C code, GCC intermediate
   passes and libgccjit log file."
-  :type 'integer
+  :type 'natnum
   :safe #'natnump
   :version "28.1")
 
@@ -74,7 +74,7 @@ This is intended for debugging the compiler itself.
   1 final LIMPLE is logged.
   2 LAP, final LIMPLE, and some pass info are logged.
   3 max verbosity."
-  :type 'integer
+  :type 'natnum
   :risky t
   :version "28.1")
 
@@ -111,7 +111,7 @@ during bootstrap."
   "Default number of subprocesses used for async native compilation.
 Value of zero means to use half the number of the CPU's execution units,
 or one if there's just one execution unit."
-  :type 'integer
+  :type 'natnum
   :risky t
   :version "28.1")
 

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 2c43db989935e1f76b8f6c2843c4ffa2113c05d5..85a154a8e076851079ddbc9a4555eb3d65f64003 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -418,22 +418,22 @@ synchronously."
 
 (defcustom package-name-column-width 30
   "Column width for the Package name in the package menu."
-  :type 'number
+  :type 'natnum
   :version "28.1")
 
 (defcustom package-version-column-width 14
   "Column width for the Package version in the package menu."
-  :type 'number
+  :type 'natnum
   :version "28.1")
 
 (defcustom package-status-column-width 12
   "Column width for the Package status in the package menu."
-  :type 'number
+  :type 'natnum
   :version "28.1")
 
 (defcustom package-archive-column-width 8
   "Column width for the Package archive in the package menu."
-  :type 'number
+  :type 'natnum
   :version "28.1")
 
 \f

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index db36909fb86f9c745fc425727bd4e2a0c2811b0c..972d4f9df000e6afcf3342d786b8c8e3594da6a7 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -146,7 +146,7 @@ See variable `eshell-scroll-to-bottom-on-output' and function
 Eshell buffers are truncated from the top to be no greater than this
 number, if the function `eshell-truncate-buffer' is on
 `eshell-output-filter-functions'."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom eshell-output-filter-functions
   '(eshell-postoutput-scroll-to-bottom

diff --git a/lisp/frame.el b/lisp/frame.el
index 6996bb2e9c6bf84992bd9493be3c730125212784..9476cb0ec46859401d1ddff1532392a41862ba1d 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2841,7 +2841,7 @@ Values smaller than 0.2 sec are treated as 0.2 sec."
   "How many times to blink before using a solid cursor on NS, X, and MS-Windows.
 Use 0 or negative value to blink forever."
   :version "24.4"
-  :type 'integer
+  :type 'natnum
   :group 'cursor)
 
 (defvar blink-cursor-blinks-done 1

diff --git a/lisp/info.el b/lisp/info.el
index f9d63b0f32d64e26bc38666cef0c8fc6cac9f4b3..906385fdc71bb85f41b7444ec45b323b0692b3f4 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -260,7 +260,7 @@ This only has an effect if `Info-hide-note-references' is non-nil."
   "Depth of breadcrumbs to display.
 0 means do not display breadcrumbs."
   :version "23.1"
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom Info-search-whitespace-regexp "\\s-+"
   "If non-nil, regular expression to match a sequence of whitespace chars.

diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index a3ada443702789decdbe17cd36a95b9d59d6e572..be26ca55f0d46664b37bea121d055f98f1b4b57d 100644 (file)
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -51,7 +51,7 @@ This variable controls both `display-time' and stealth fontification.
 
 The optimum value is a little over the typical number of buffer
 characters which fit in a typical window."
-  :type 'integer)
+  :type 'natnum)
 
 
 (defcustom jit-lock-stealth-time nil

diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 14be909722b92e702f2c842e7fecb6cb3e22f322..92118ad1433c5acd169935e594def91636f185fe 100644 (file)
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -129,7 +129,7 @@ Set to nil if no mouse binding is desired."
 
 (defcustom kmacro-ring-max 8
   "Maximum number of keyboard macros to save in macro ring."
-  :type 'integer)
+  :type 'natnum)
 
 
 (defcustom kmacro-execute-before-append t

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 92989fcfb2e4e63f650bfbbfab17ccc153dc9eaf..a134654a0203f10b0733b65766d0e2d610930e23 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2194,12 +2194,12 @@ otherwise it could decide to silently do nothing."
 
 (defcustom yank-menu-length 20
   "Text of items in `yank-menu' longer than this will be truncated."
-  :type 'integer
+  :type 'natnum
   :group 'menu)
 
 (defcustom yank-menu-max-items 60
   "Maximum number of entries to display in the `yank-menu'."
-  :type 'integer
+  :type 'natnum
   :group 'menu
   :version "29.1")
 

diff --git a/lisp/midnight.el b/lisp/midnight.el
index 3e309a5c88108357402ff541af15249379b8abd7..60d9b565ef050eb2e05d9b224f05efe02ad386ce 100644 (file)
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -67,14 +67,14 @@ The autokilling is done by `clean-buffer-list' when it is in `midnight-hook'.
 Currently displayed and/or modified (unsaved) buffers, as well as buffers
 matching `clean-buffer-list-kill-never-buffer-names' and
 `clean-buffer-list-kill-never-regexps' are excluded."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom clean-buffer-list-delay-special 3600
   "The number of seconds before some buffers become eligible for autokilling.
 Buffers matched by `clean-buffer-list-kill-regexps' and
 `clean-buffer-list-kill-buffer-names' are killed if they were last
 displayed more than this many seconds ago."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom clean-buffer-list-kill-regexps '("\\`\\*Man ")
   "List of regexps saying which buffers will be killed at midnight.

diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index e0824f39716a1acd5518457f26b743ba7612d44f..eec405373db50480697c63ae71b2589597a6cb18 100644 (file)
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -89,7 +89,7 @@ You can specify here:
 This port is probably always 2628 so there should be no need to modify it."
   :group 'dictionary
   :set #'dictionary-set-server-var
-  :type 'number
+  :type 'natnum
   :version "28.1")
 
 (defcustom dictionary-identification
@@ -206,7 +206,7 @@ where the current word was found."
   "The port of the proxy server, used only when `dictionary-use-http-proxy' is set."
   :group 'dictionary-proxy
   :set #'dictionary-set-server-var
-  :type 'number
+  :type 'natnum
   :version "28.1")
 
 (defcustom dictionary-use-single-buffer

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index da45457891b4dfd85137a7d94d99a4d985aa9696..0f2943cbb033c37aaa85cd78ab2575fa52ced379 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -54,7 +54,7 @@ a separator."
 Initialized from the LDAP library at build time.
 Default value is 389."
   :type '(choice (const :tag "Use library default" nil)
-                (integer :tag "Port number")))
+                 (natnum :tag "Port number")))
 
 (defcustom ldap-default-base nil
   "Default base for LDAP searches.

diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index 0f6dfb6ad4676c8f3c25118d06fdf87a6264c334..de225d76dccb69624d2efdb1e0a1c3bc1f30facf 100644 (file)
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -59,7 +59,7 @@
 (defcustom pop3-port 110
   "POP3 port."
   :version "22.1" ;; Oort Gnus
-  :type 'number
+  :type 'natnum
   :group 'pop3)
 
 (defcustom pop3-password-required t
@@ -88,7 +88,7 @@ valid value is `apop'."
 The lower the number, the more latency-sensitive the fetching
 will be.  If your pop3 server doesn't support streaming at all,
 set this to 1."
-  :type 'number
+  :type 'natnum
   :version "24.1"
   :group 'pop3)
 

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 36352a46734e37035143ad0e6a9a203fc0daadef..dc0946fb09a3bf420e19a0d4c3f20fb3a6134b4b 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -130,7 +130,7 @@ be displayed instead."
 
 (defcustom rcirc-default-port 6667
   "The default port to connect to."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom rcirc-default-nick (user-login-name)
   "Your nick."

diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el
index 50342b9105ab12cb70b8f7d00b1e5fe422285313..a39e35a53a127caaf9ff4059bf20ebd2665f8f7d 100644 (file)
--- a/lisp/net/sieve-manage.el
+++ b/lisp/net/sieve-manage.el
@@ -131,7 +131,7 @@ for doing the actual authentication."
 
 (defcustom sieve-manage-default-port "sieve"
   "Default port number or service name for managesieve protocol."
-  :type '(choice integer string)
+  :type '(choice natnum string)
   :version "24.4")
 
 (defcustom sieve-manage-default-stream 'network

diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index f2bdba1c2aa48b294c86401fe1dd65f1051b35e4..ccff2e75b0af3306c405b40d65e3a4b88a17fc50 100644 (file)
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -49,7 +49,7 @@
 
 (defcustom spook-phrase-default-count 15
   "Default number of phrases to insert."
-  :type 'integer)
+  :type 'natnum)
 
 ;;;###autoload
 (defun spook ()

diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index d9bc0dd020c6047facde96cd62a1b1ecd15799fb..a6bfea81ee1185d32b302791155c466f2d70cba3 100644 (file)
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -95,27 +95,27 @@ If the return value is a number, it is used as the timer period."
 
 (defcustom tetris-buffer-width 30
   "Width of used portion of buffer."
-  :type 'number)
+  :type 'natnum)
 
 (defcustom tetris-buffer-height 22
   "Height of used portion of buffer."
-  :type 'number)
+  :type 'natnum)
 
 (defcustom tetris-width 10
   "Width of playing area."
-  :type 'number)
+  :type 'natnum)
 
 (defcustom tetris-height 20
   "Height of playing area."
-  :type 'number)
+  :type 'natnum)
 
 (defcustom tetris-top-left-x 3
   "X position of top left of playing area."
-  :type 'number)
+  :type 'natnum)
 
 (defcustom tetris-top-left-y 1
   "Y position of top left of playing area."
-  :type 'number)
+  :type 'natnum)
 
 (defcustom tetris-allow-repetitions t
   "If non-nil, use a random selection for each shape.

diff --git a/lisp/profiler.el b/lisp/profiler.el
index 94c24c62aa6e9b58e048c235720d46ef24c0561e..8670e5786a4abc798929266a13e2bf7a841ecf77 100644 (file)
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -38,7 +38,7 @@
 
 (defcustom profiler-sampling-interval 1000000
   "Default sampling interval in nanoseconds."
-  :type 'integer
+  :type 'natnum
   :group 'profiler)
 
 \f

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index ef8375e859ccb309da97fa8f998398617e5d4610..b950f93f2a036ae3f99db248852e2605df398bd2 100644 (file)
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -274,8 +274,8 @@ file.  Since that is a plaintext file, this could be dangerous."
 (defcustom sql-port 0
   "Default port for connecting to a MySQL or Postgres server."
   :version "24.1"
-  :type 'number
-  :safe 'numberp)
+  :type 'natnum
+  :safe 'natnump)
 
 (defcustom sql-default-directory nil
   "Default directory for SQL processes."

diff --git a/lisp/recentf.el b/lisp/recentf.el
index 601b2642f765a93cb25fe1eeb91a41c0d0b024ec..4bc1ab5c21974b8a1ff36d77c1c5c0afdeb4f644 100644 (file)
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -178,7 +178,7 @@ The default is to call `find-file' to edit the selected file."
 (defcustom recentf-max-menu-items 10
   "Maximum number of items in the recentf menu."
   :group 'recentf
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom recentf-menu-filter nil
   "Function used to filter files displayed in the recentf menu.

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 172acaa4e87db89b15499e52fe65a583743079fa..8924c8dde2360dffa29ebbbdb292ad240ae6f952 100644 (file)
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -97,7 +97,8 @@ This is decimal, not octal.  The default is 384 (0600 in octal).
 Set to nil to use the default permissions that Emacs uses, typically
 mandated by umask.  The default is a bit more restrictive to protect
 the user's privacy."
-  :type 'integer)
+  :type '(choice (natnum :tag "Specify")
+                 (const :tag "Use default" :value nil)))
 
 (defcustom savehist-autosave-interval (* 5 60)
   "The interval between autosaves of minibuffer history.

diff --git a/lisp/strokes.el b/lisp/strokes.el
index 5402ebf1e1c1b686f59241a6be43973d44cdc208..376cbc0cfee1c2c09c03e40b0639d849644f3b7a 100644 (file)
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -252,7 +252,7 @@ WARNING: Changing the value of this variable will gravely affect the
          figure out what it should be based on your needs and on how
          quick the particular platform(s) you're operating on, and
          only then start programming in your custom strokes."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom strokes-file (locate-user-emacs-file "strokes" ".strokes")
   "File containing saved strokes for Strokes mode."

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 4ca177f73b77adc274b2cc872cbbe70a24ef9df4..fdfbe207b5f61b343d3bd6bf9d624ee85499a4b1 100644 (file)
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -618,7 +618,7 @@ Also add the number of windows in the window configuration."
   "Maximum length of the tab name from the current buffer.
 Effective when `tab-bar-tab-name-function' is customized
 to `tab-bar-tab-name-truncated'."
-  :type 'integer
+  :type 'natnum
   :group 'tab-bar
   :version "27.1")
 

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index a7e257f41c54e5baca22bdf6cd9baa64899ecc2a..08e38c9a050512654766e7d6c8b7ea38d562448d 100644 (file)
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -66,7 +66,7 @@ If you select a region larger than this size, it won't be copied to your system
 clipboard.  Since clipboard data is base 64 encoded, the actual number of
 string bytes that can be copied is 3/4 of this value."
   :version "25.1"
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom xterm-set-window-title nil
   "Whether Emacs should set window titles to an Emacs frame in an XTerm."

diff --git a/lisp/time.el b/lisp/time.el
index cd985bfb2882ebababcf7df2f1a4d9a748301b62..e7066cae7a5b4e286e4411cd010645170f8749df 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -93,7 +93,7 @@ Non-nil means \\[display-time] should display day and date as well as time."
 
 (defcustom display-time-interval 60
   "Seconds between updates of time in the mode line."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom display-time-24hr-format nil
   "Non-nil indicates time should be displayed as hh:mm, 0 <= hh <= 23.
@@ -519,7 +519,7 @@ If the value is t instead of an alist, use the value of
 
 (defcustom world-clock-timer-second 60
   "Interval in seconds for updating the `world-clock' buffer."
-  :type 'integer
+  :type 'natnum
   :version "28.1")
 
 (defface world-clock-label

diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 3e69227124fd3fd2b4cb909b2c6d210a87d64507..db8c121cf0036d37c3508140b95e776cbb14dc6d 100644 (file)
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -37,7 +37,7 @@
   "Default maximum time in seconds before cache files expire.
 Used by the function `url-cache-expired'."
   :version "24.1"
-  :type 'integer
+  :type 'natnum
   :group 'url-cache)
 
 ;; Cache manager

diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 15c78512c64e05d94a1580e5c7e5a866372b8a7c..0709cdd3fa1b408d38b36c1c547b61a0190b55b0 100644 (file)
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -360,7 +360,7 @@ to run the `url-cookie-setup-save-timer' function manually."
          (set-default var val)
          (if (bound-and-true-p url-setup-done)
              (url-cookie-setup-save-timer)))
-  :type 'integer
+  :type 'natnum
   :group 'url-cookie)
 
 (defun url-cookie-setup-save-timer ()

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index cb4814afcadec7b94d77d38514971ff3e030c24b..058e601301b96e0a786911e577c4c6581a4c5136 100644 (file)
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -63,7 +63,7 @@ to run the `url-history-setup-save-timer' function manually."
          (set-default var val)
          (if (bound-and-true-p url-setup-done)
              (url-history-setup-save-timer)))
-  :type 'integer
+  :type 'natnum
   :group 'url-history)
 
 (defvar url-history-timer nil)

diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index b2e24607e1172615e1eba9e7366fc8cfdc790785..cf45a7f681a936372fb7fd297eb4fe059aa02b77 100644 (file)
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -36,13 +36,13 @@
 (defcustom url-queue-parallel-processes 6
   "The number of concurrent processes."
   :version "24.1"
-  :type 'integer
+  :type 'natnum
   :group 'url)
 
 (defcustom url-queue-timeout 5
   "How long to let a job live once it's started (in seconds)."
   :version "24.1"
-  :type 'integer
+  :type 'natnum
   :group 'url)
 
 ;;; Internal variables.

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 1012525568be12ef94706b7814b680d9aa1ca617..de42599e0d464a6fde28f0160ccc4dc10797e4a2 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -297,7 +297,7 @@ get the first available language (as opposed to the default)."
 (defcustom url-max-password-attempts 5
   "Maximum number of times a password will be prompted for.
 Applies when a protected document is denied by the server."
-  :type 'integer
+  :type 'natnum
   :group 'url)
 
 (defcustom url-show-status t
@@ -330,7 +330,7 @@ undefined."
 (defcustom url-max-redirections 30
   "The maximum number of redirection requests to honor in a HTTP connection.
 A negative number means to honor an unlimited number of redirection requests."
-  :type 'integer
+  :type 'natnum
   :group 'url)
 
 (defcustom url-confirmation-func 'y-or-n-p

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 6e94ea0715725c9524bb950e573bf8121cfc8c62..422ed5c0a4d63742700fca6fcc38d240e6b068eb 100644 (file)
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -221,7 +221,7 @@ depend on the flags."
 
 (defcustom emerge-min-visible-lines 3
   "Number of lines to show above and below the flags when displaying a difference."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom emerge-temp-file-prefix
   (expand-file-name "emerge" temporary-file-directory)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index d6f0f4a497750826f3e9b1f3b025a4d502863c0c..d3e53858c16de8ae1eed44b857c2ae63bfc2e0d0 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -824,7 +824,7 @@ for the backend you use."
   "Limit the number of items shown by the VC log commands.
 Zero means unlimited.
 Not all VC backends are able to support this feature."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom vc-allow-async-revert nil
   "Specifies whether the diff during \\[vc-revert] may be asynchronous.

diff --git a/lisp/window.el b/lisp/window.el
index eba888a89dd6e8e121cf3caea40dfe85e8f6f28f..a3ef2521bb790956e871c01c6f1490911e264acc 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -451,7 +451,7 @@ window to a height less than the one specified here, an
 application should instead call `window-resize' with a non-nil
 IGNORE argument.  In order to have `split-window' make a window
 shorter, explicitly specify the SIZE argument of that function."
-  :type 'integer
+  :type 'natnum
   :version "24.1"
   :group 'windows)
 
@@ -483,7 +483,7 @@ window to a width less than the one specified here, an
 application should instead call `window-resize' with a non-nil
 IGNORE argument.  In order to have `split-window' make a window
 narrower, explicitly specify the SIZE argument of that function."
-  :type 'integer
+  :type 'natnum
   :version "24.1"
   :group 'windows)
 

diff --git a/lisp/winner.el b/lisp/winner.el
index 9b2433b492965b0e4501315078a40fe73c7ecdb9..38ab5f510165728448bc03fc374e39a01c00f644 100644 (file)
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -50,7 +50,7 @@
 
 (defcustom winner-ring-size 200
   "Maximum number of stored window configurations per frame."
-  :type 'integer)
+  :type 'natnum)
 
 (defcustom winner-boring-buffers '("*Completions*")
   "List of buffer names whose windows `winner-undo' will not restore.