diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 53cb00eb1ba..cfa780ed586 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -766,7 +766,7 @@ may happen."
 
 (defcustom hfy-font-zoom 1.05
   "Font scaling from Emacs to HTML."
-  :type 'float)
+  :type 'number)
 
 (defun hfy-size (height)
   "Derive a CSS font-size specifier from an Emacs font :height attribute HEIGHT.
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 90c6f7663b5..1928b0a2955 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -1078,7 +1078,7 @@ Resized or in full-size."
 (defcustom image-dired-slideshow-delay 5.0
   "Seconds to wait before showing the next image in a slideshow.
 This is used by `image-dired-slideshow-start'."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (define-obsolete-variable-alias 'image-dired-slideshow-timer
diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index 5b2dc089a52..057ff379ef6 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -161,22 +161,22 @@ This is only effective if supported by your mouse or touchpad."
 
 (defcustom pixel-scroll-precision-momentum-tick 0.01
   "Number of seconds between each momentum scroll."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-momentum-seconds 1.75
   "The maximum duration in seconds of momentum scrolling."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-momentum-min-velocity 10.0
   "The minimum scrolled pixels per second before momentum scrolling starts."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-initial-velocity-factor (/ 0.0335 4)
   "Factor applied to the initial velocity before momentum scrolling begins."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-large-scroll-height nil
@@ -188,17 +188,17 @@ Nil means to not interpolate such scrolls."
 
 (defcustom pixel-scroll-precision-interpolation-total-time 0.1
   "The total time in seconds to spend interpolating a large scroll."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-interpolation-factor 2.0
   "A factor to apply to the distance of an interpolated scroll."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-interpolation-between-scroll 0.001
   "The number of seconds between each step of an interpolated scroll."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defcustom pixel-scroll-precision-interpolate-page nil
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 33df0a65797..115a9911270 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -102,7 +102,7 @@
   "Total number of seconds to wait in between steps.
 This is added to the total time it takes to run `animate-string'
 to ensure that the animation is not too fast to be seen."
-  :type 'float
+  :type 'number
   :version "29.1")
 
 (defvar animation-buffer-name nil
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 669638544ce..b350b5dadf9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4396,12 +4396,12 @@ When a match is found, native completion is disabled."
 (defcustom python-shell-completion-native-output-timeout 5.0
   "Time in seconds to wait for completion output before giving up."
   :version "25.1"
-  :type 'float)
+  :type 'number)
 
 (defcustom python-shell-completion-native-try-output-timeout 1.0
   "Time in seconds to wait for *trying* native completion output."
   :version "25.1"
-  :type 'float)
+  :type 'number)
 
 (defvar python-shell-readline-completer-delims nil
   "Word delimiters used by the readline completer.
diff --git a/lisp/which-key.el b/lisp/which-key.el
index 208f90b3d46..e3048c4a1db 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -61,7 +61,7 @@ This variable should be set before activating `which-key-mode'.
 A value of zero might lead to issues, so a non-zero value is
 recommended
 (see https://github.com/justbur/emacs-which-key/issues/134)."
-  :type 'float
+  :type 'number
   :package-version "1.0" :version "30.1")
 
 (defcustom which-key-idle-secondary-delay nil
@@ -82,7 +82,7 @@ This only applies if `which-key-popup-type' is minibuffer or
 `which-key-show-prefix' is echo.  It needs to be less than
 `which-key-idle-delay' or else the keystroke echo will erase the
 which-key popup."
-  :type 'float
+  :type 'number
   :package-version '(which-key . "1.0") :version "30.1")
 
 (defcustom which-key-max-description-length 27
@@ -331,14 +331,14 @@ the right of) the middle slot.  The default is zero."
   "Maximum width of which-key popup when type is side-window.
 This variable can also be a number between 0 and 1. In that case,
 it denotes a percentage out of the frame's width."
-  :type 'float
+  :type 'number
   :package-version '(which-key . "1.0") :version "30.1")
 
 (defcustom which-key-side-window-max-height 0.25
   "Maximum height of which-key popup when type is side-window.
 This variable can also be a number between 0 and 1. In that case, it denotes
 a percentage out of the frame's height."
-  :type 'float
+  :type 'number
   :package-version '(which-key . "1.0") :version "30.1")
 
 (defcustom which-key-frame-max-width 60