Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 11 deletions

diff --git a/upstream/debian-unstable/man3/ins_wstr.3ncurses b/upstream/debian-unstable/man3/ins_wstr.3ncurses
index d2b5021c..1cc89cec 100644
--- a/upstream/debian-unstable/man3/ins_wstr.3ncurses
+++ b/upstream/debian-unstable/man3/ins_wstr.3ncurses
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2019-2022,2023 Thomas E. Dickey                                *
+.\" Copyright 2019-2023,2024 Thomas E. Dickey                                *
 .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.30 2023/12/16 20:36:15 tom Exp $
-.TH ins_wstr 3NCURSES 2023-12-16 "ncurses 6.4" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.38 2024/04/20 21:23:08 tom Exp $
+.TH ins_wstr 3NCURSES 2024-04-20 "ncurses 6.5" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -89,7 +89,7 @@ Special characters are handled as in \fB\%wadd_wch\fP(3NCURSES).
 .SH RETURN VALUE
 All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 .PP
-X/Open does not define any error conditions.
+X/Open Curses does not specify any error conditions.
 This implementation returns an error
 .bP
 if the \fIwin\fP parameter is null or
@@ -98,18 +98,20 @@ if the \fIwstr\fP parameter is null or
 .bP
 if the \fBwins_wch\fP function returns an error.
 .PP
-Functions with a \*(``mv\*('' prefix first perform a cursor movement using
-\fB\%wmove\fP(3NCURSES), and return an error if the position is outside the window,
-or if the window pointer is null.
+Functions prefixed with \*(``mv\*('' first perform cursor movement and
+fail if the position
+.RI ( y ,
+.IR x )
+is outside the window boundaries.
 .SH NOTES
 All but \fBwins_nwstr\fP may be macros.
 .PP
 If the first character in the string is a non-spacing character, these
 functions will fail.
-XSI does not define what will happen if a non-spacing character follows
-a control character.
+X/Open Curses does not define what will happen
+if a non-spacing character follows a control character.
 .SH PORTABILITY
-These functions are described in the XSI Curses standard, Issue 4,
+These functions are described in X/Open Curses, Issue 4,
 which adds \fI\%const\fP qualifiers to the arguments.
 .PP
 X/Open states that the entire string is inserted if \fIn\fP is less than 1.
@@ -117,7 +119,10 @@ This is probably an error,
 because it is inconsistent with other functions,
 and differs from the X/Open implementation on Solaris.
 .SH SEE ALSO
+\fB\%insstr\fP(3NCURSES) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%ncurses\fP(3NCURSES),
-\fB\%insstr\fP(3NCURSES),
 \fB\%ins_wch\fP(3NCURSES),
 \fB\%in_wch\fP(3NCURSES)