From: Mattias Engdegård <mattiase@acm.org>
Date: Fri, 7 Oct 2022 09:43:19 +0000 (+0200)
Subject: Clearer byte-compiler arity warnings (bug#58319)
X-Git-Tag: emacs-29.0.90~1616^2~718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b4c17dec06b7cac4025317daef68c302c61d4e6;p=emacs.git

Clearer byte-compiler arity warnings (bug#58319)

* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-signature-string):
Replace '3+' and '3-4' with '3 or more' and '3 or 4', respectively.
---

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 03c45e44a56..74ba8984f29 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1469,9 +1469,11 @@ when printing the error message."
 
 (defun byte-compile-arglist-signature-string (signature)
   (cond ((null (cdr signature))
-	 (format "%d+" (car signature)))
+	 (format "%d or more" (car signature)))
 	((= (car signature) (cdr signature))
 	 (format "%d" (car signature)))
+	((= (1+ (car signature)) (cdr signature))
+	 (format "%d or %d" (car signature) (cdr signature)))
 	(t (format "%d-%d" (car signature) (cdr signature)))))
 
 (defun byte-compile-function-warn (f nargs def)