Merge from origin/emacs-30

1895ba3ba3 ; Document %i format
85db0ac0d6 ; * doc/lispref/nonascii.texi (Explicit Encoding): Fix a ...
c119a3600e ; * doc/lispref/tips.texi (Documentation Tips): Document ...

Also fix trailing whitespace in test files.

doc/lispref/nonascii.texi

@@ -2003,7 +2003,7 @@ original text:
 @example
 @group
 (decode-coding-string "Gr\374ss Gott" 'latin-1)
-     @result{} #("Gr@"uss Gott" 0 9 (charset iso-8859-1))
+     @result{} #("Gr@"uss Gott" 0 10 (charset iso-8859-1))
 @end group
 @end example
 @end defun

doc/lispref/strings.texi

@@ -1035,6 +1035,7 @@ way.  The object can also be a floating-point number that is formatted
 as an integer, dropping any fraction.
 
 @item %d
+@itemx %i
 Replace the specification with the base-ten representation of a signed
 integer.  The object can also be a floating-point number that is
 formatted as an integer, dropping any fraction.

doc/lispref/tips.texi

@@ -774,6 +774,15 @@ that satisfy the criterion.
 does not make a hyperlink to the documentation, irrelevant here, of the
 function @code{list}.
 
+Alternatively, you could precede the symbol with @samp{\\+} to prevent
+marking it as a hyperlink.  Example:
+
+@example
+If the value of KIND-OF-RESULT is \\+`list',
+this function returns a list of all the objects
+that satisfy the criterion.
+@end example
+
 Normally, no hyperlink is made for a variable without variable
 documentation.  You can force a hyperlink for such variables by
 preceding them with one of the words @samp{variable} or

src/editfns.c

@@ -3343,7 +3343,7 @@ The format control string may contain %-sequences meaning to substitute
 the next available argument, or the argument explicitly specified:
 
 %s means produce a string argument.  Actually, produces any object with `princ'.
-%d means produce as signed number in decimal.
+%d or %i means produce a signed number in decimal.
 %o means produce a number in octal.
 %x means produce a number in hex.
 %X is like %x, but uses upper case.
@@ -3355,7 +3355,7 @@ the next available argument, or the argument explicitly specified:
 %c means produce a number as a single character.
 %S means produce any object as an s-expression (using `prin1').
 
-The argument used for %d, %o, %x, %e, %f, %g or %c must be a number.
+The argument used for %d, %i, %o, %x, %e, %f, %g or %c must be a number.
 %o, %x, and %X treat arguments as unsigned if `binary-as-unsigned' is t
   (this is experimental; email 32252@debbugs.gnu.org if you need it).
 Use %% to put a single % into the output.

test/lisp/emacs-lisp/bytecomp-resources/macro-warning-position-2.el

@@ -16,4 +16,3 @@
 	     (numberp bar)))
     bar)
    (t (increase))))
-    

test/lisp/emacs-lisp/bytecomp-resources/macro-warning-position.el

@@ -16,4 +16,3 @@
 	     (numberp bar)))
     bar)
    (t (increase))))
-