From 2035f48ed0fc56ec4e5caf9b7c10e00ba43e160f Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 10 Sep 2023 00:04:21 +0000 Subject: [PATCH] ncurses 6.4 - patch 20230909 + improve formatting of manpages (patches by Branden Robinson). > patches by Nicholas Marriott: + use string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c, overlooked due to compiler changes in recent OpenBSD releases. + add "-6" option to ncu2openbsd script. --- NEWS | 9 +- VERSION | 2 +- dist.mk | 4 +- doc/html/man/adacurses6-config.1.html | 4 +- doc/html/man/captoinfo.1m.html | 18 +-- doc/html/man/clear.1.html | 10 +- doc/html/man/curs_attr.3x.html | 8 +- doc/html/man/curs_mouse.3x.html | 8 +- doc/html/man/default_colors.3x.html | 4 +- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 10 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 10 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/new_pair.3x.html | 8 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/scr_dump.5.html | 8 +- doc/html/man/tabs.1.html | 10 +- doc/html/man/term.5.html | 53 +++--- doc/html/man/term_variables.3x.html | 8 +- doc/html/man/terminfo.5.html | 225 +++++++++++++------------- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 10 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- doc/html/man/user_caps.5.html | 8 +- man/MKada_config.in | 15 +- man/captoinfo.1m | 24 +-- man/clear.1 | 11 +- man/curs_attr.3x | 11 +- man/curs_mouse.3x | 11 +- man/default_colors.3x | 4 +- man/infocmp.1m | 11 +- man/ncurses.3x | 15 +- man/new_pair.3x | 11 +- man/scr_dump.5 | 11 +- man/tabs.1 | 11 +- man/term.5 | 27 ++-- man/term_variables.3x | 11 +- man/terminfo.head | 24 ++- man/terminfo.tail | 148 ++++++++--------- man/toe.1m | 11 +- man/user_caps.5 | 18 +-- misc/ncu2openbsd | 22 +-- ncurses/curses.priv.h | 4 +- ncurses/tinfo/alloc_entry.c | 36 +++-- ncurses/tinfo/alloc_ttype.c | 24 ++- ncurses/tinfo/lib_raw.c | 20 +-- ncurses/tty/hardscroll.c | 4 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 57 files changed, 517 insertions(+), 422 deletions(-) diff --git a/NEWS b/NEWS index c214db31..81fabef5 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3992 2023/09/02 22:31:36 tom Exp $ +-- $Id: NEWS,v 1.3995 2023/09/09 16:45:37 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20230909 + + improve formatting of manpages (patches by Branden Robinson). + > patches by Nicholas Marriott: + + use string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c, + overlooked due to compiler changes in recent OpenBSD releases. + + add "-6" option to ncu2openbsd script. + 20230902 + improve description of search rules for terminal descriptions in terminfo manpage (report by Sven Joachim). diff --git a/VERSION b/VERSION index 65d711a1..11d281c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20230902 +5:0:10 6.4 20230909 diff --git a/dist.mk b/dist.mk index 19915305..0125602a 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1562 2023/09/02 09:30:01 tom Exp $ +# $Id: dist.mk,v 1.1563 2023/09/09 12:21:39 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 4 -NCURSES_PATCH = 20230902 +NCURSES_PATCH = 20230909 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 17293d49..e649144c 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -27,7 +27,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: MKada_config.in,v 1.16 2023/08/19 19:12:34 tom Exp @ + * @Id: MKada_config.in,v 1.17 2023/09/09 17:06:25 Branden.Robinson Exp @ --> @@ -126,7 +126,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 08f5d51f..c5ac5f73 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.37 2023/08/19 20:36:21 tom Exp @
+  * @Id: captoinfo.1m,v 1.39 2023/09/09 16:40:25 tom Exp @
 -->
 
 
 
 
 
-captoinfo 1m 2023-08-19 ncurses 6.4 User commands
+captoinfo 1m 2023-09-09 ncurses 6.4 User commands
 
 
 
 
-
captoinfo 1m 2023-08-19 ncurses 6.4 User commands

+
captoinfo 1m 2023-09-09 ncurses 6.4 User commands

 
 captoinfo(1m)                    User commands                   captoinfo(1m)
 
@@ -92,8 +92,8 @@
        not mistakenly translated a completely unknown  and  random  capability
        and/or syntax error.
 
-       Nonstd   Std    From           Terminfo
-        name    name                 capability
+       Nonstd   Std                   Terminfo
+        name    name   From          capability
        -----------------------------------------------
        BO       mr     AT&T    enter_reverse_mode
        CI       vi     AT&T    cursor_invisible
@@ -129,7 +129,7 @@
        forms drawing, designed to take  advantage  of  the  IBM  PC  high-half
        graphics.  They were as follows:
 
-       Cap          Graphic
+       Cap          Graphic
        -----------------------------
        G2    upper left
        G3    lower left
@@ -163,7 +163,7 @@
        incompatible with the SVr4 format.  The following  AIX  extensions  are
        automatically translated:
 
-        IBM    XSI
+        IBM    XSI
        -------------
        ksel    kslt
        kbtab   kcbt
@@ -199,7 +199,7 @@
 
SEE ALSO
        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
AUTHOR
@@ -208,7 +208,7 @@
 
 
 
-ncurses 6.4                       2023-08-19                     captoinfo(1m)
+ncurses 6.4                       2023-09-09                     captoinfo(1m)
 

 

 
    
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 13877ea6..f14e94ba 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.33 2023/07/01 14:23:04 tom Exp @
+  * @Id: clear.1,v 1.35 2023/09/09 21:12:26 tom Exp @
   * these would be fallbacks for DS/DE,
   * but groff changed the meaning of the macros.
 -->
@@ -36,12 +36,12 @@
 
 
 
-clear 1 2023-07-01 ncurses 6.4 User commands
+clear 1 2023-09-09 ncurses 6.4 User commands
 
 
 
 
-
    clear 1 2023-07-01 ncurses 6.4 User commands
    
+
    clear 1 2023-09-09 ncurses 6.4 User commands
    
 
     clear(1)                         User commands                        clear(1)
 
@@ -150,11 +150,11 @@
 
    SEE ALSO
            tput(1), xterm(1), terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
-ncurses 6.4                       2023-07-01                          clear(1)
+ncurses 6.4                       2023-09-09                          clear(1)
 
    
 
    
 
      
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 8e3db63e..fbb1e131 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.78 2023/08/19 20:37:30 tom Exp @
+  * @Id: curs_attr.3x,v 1.80 2023/09/09 21:13:26 tom Exp @
   * ---------------------------------------------------------------------------
   * attr_get
   * .br
@@ -56,12 +56,12 @@
 
 
 
-curs_attr 3x 2023-08-19 ncurses 6.4 Library calls
+curs_attr 3x 2023-09-09 ncurses 6.4 Library calls
 
 
 
 
-
      curs_attr 3x 2023-08-19 ncurses 6.4 Library calls
      
+
      curs_attr 3x 2023-09-09 ncurses 6.4 Library calls
      
 
       curs_attr(3x)                    Library calls                   curs_attr(3x)
 
@@ -520,7 +520,7 @@
 
 
 
-ncurses 6.4                       2023-08-19                     curs_attr(3x)
+ncurses 6.4                       2023-09-09                     curs_attr(3x)
 
      
 
      
 
        
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index cf5ce974..78e3ac5b 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.64 2023/07/01 15:43:20 tom Exp @
+  * @Id: curs_mouse.3x,v 1.66 2023/09/09 21:13:51 tom Exp @
 -->
 
 
 
 
 
-curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls
+curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls
 
 
 
 
-
        curs_mouse 3x 2023-07-01 ncurses 6.4 Library calls
        
+
        curs_mouse 3x 2023-09-09 ncurses 6.4 Library calls
        
 
         curs_mouse(3x)                   Library calls                  curs_mouse(3x)
 
@@ -375,7 +375,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                    curs_mouse(3x)
+ncurses 6.4                       2023-09-09                    curs_mouse(3x)
 
        
 
        
 
          
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index ae68f47f..a489ca81 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -1,6 +1,6 @@
 
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 3a899c2d..f69d0052 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@
        curses(3x) and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 1551b5b2..2abfabee 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infocmp.1m,v 1.88 2023/09/02 22:29:02 tom Exp @
+  * @Id: infocmp.1m,v 1.90 2023/09/09 21:14:05 tom Exp @
 -->
 
 
 
 
 
-infocmp 1m 2023-09-02 ncurses 6.4 User commands
+infocmp 1m 2023-09-09 ncurses 6.4 User commands
 
 
 
 
-
          infocmp 1m 2023-09-02 ncurses 6.4 User commands
          
+
          infocmp 1m 2023-09-09 ncurses 6.4 User commands
          
 
           infocmp(1m)                      User commands                     infocmp(1m)
 
@@ -522,7 +522,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
          AUTHOR
          @@ -531,7 +531,7 @@
 
 
 
-ncurses 6.4                       2023-09-02                       infocmp(1m)
+ncurses 6.4                       2023-09-09                       infocmp(1m)
 
          
 
          
 
            
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 1e782424..4b794ec2 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@

SEE ALSO

        infocmp(1m), tic(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).

AUTHOR

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 17b04645..6022f6cc 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@
        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 3e0e6d36..9142cfa4 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.164 2023/08/19 19:23:43 tom Exp @
+  * @Id: ncurses.3x,v 1.167 2023/09/09 21:11:08 tom Exp @
 -->
 
 
 
 
 
-ncurses 3x 2023-08-19 ncurses 6.4 Library calls
+ncurses 3x 2023-09-09 ncurses 6.4 Library calls
 
 
 
 
-
ncurses 3x 2023-08-19 ncurses 6.4 Library calls

+
ncurses 3x 2023-09-09 ncurses 6.4 Library calls

 
 ncurses(3x)                      Library calls                     ncurses(3x)
 
@@ -60,7 +60,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
@@ -1482,7 +1482,7 @@
 
 
 
-ncurses 6.4                       2023-08-19                       ncurses(3x)
+ncurses 6.4                       2023-09-09                       ncurses(3x)
 

 

 
    
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index a1cb6803..974aff84 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html
index 08d1bd6f..d55b3c7e 100644
--- a/doc/html/man/new_pair.3x.html
+++ b/doc/html/man/new_pair.3x.html
@@ -28,19 +28,19 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey
-  * @Id: new_pair.3x,v 1.24 2023/07/01 15:46:10 tom Exp @
+  * @Id: new_pair.3x,v 1.26 2023/09/09 21:20:16 tom Exp @
 -->
 
 
 
 
 
-new_pair 3x 2023-07-01 ncurses 6.4 Library calls
+new_pair 3x 2023-09-09 ncurses 6.4 Library calls
 
 
 
 
-
new_pair 3x 2023-07-01 ncurses 6.4 Library calls

+
new_pair 3x 2023-09-09 ncurses 6.4 Library calls

 
 new_pair(3x)                     Library calls                    new_pair(3x)
 
@@ -164,7 +164,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                      new_pair(3x)
+ncurses 6.4                       2023-09-09                      new_pair(3x)
 

 

 
    
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index fd022682..972eff35 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).

AUTHOR

diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html
index f7cf53c9..f090e278 100644
--- a/doc/html/man/scr_dump.5.html
+++ b/doc/html/man/scr_dump.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: scr_dump.5,v 1.25 2023/07/01 15:46:10 tom Exp @
+  * @Id: scr_dump.5,v 1.27 2023/09/09 21:20:16 tom Exp @
 -->
 
 
 
 
 
-scr_dump 5 2023-07-01 ncurses 6.4 File formats
+scr_dump 5 2023-09-09 ncurses 6.4 File formats
 
 
 
 
-
scr_dump 5 2023-07-01 ncurses 6.4 File formats

+
scr_dump 5 2023-09-09 ncurses 6.4 File formats

 
 scr_dump(5)                      File formats                      scr_dump(5)
 
@@ -407,7 +407,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                       scr_dump(5)
+ncurses 6.4                       2023-09-09                       scr_dump(5)
 

 

 
    
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index fc4b89c9..cf8d9ab5 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.39 2023/07/01 15:46:10 tom Exp @
+  * @Id: tabs.1,v 1.41 2023/09/09 21:19:07 tom Exp @
 -->
 
 
 
 
 
-tabs 1 2023-07-01 ncurses 6.4 User commands
+tabs 1 2023-09-09 ncurses 6.4 User commands
 
 
 
 
-
    tabs 1 2023-07-01 ncurses 6.4 User commands
    
+
    tabs 1 2023-09-09 ncurses 6.4 User commands
    
 
     tabs(1)                          User commands                         tabs(1)
 
@@ -252,11 +252,11 @@
 
    SEE ALSO
            infocmp(1m), tset(1), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
-ncurses 6.4                       2023-07-01                           tabs(1)
+ncurses 6.4                       2023-09-09                           tabs(1)
 
    
 
    
 
      
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index d7d7cdf3..356b849f 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term.5,v 1.48 2023/07/01 15:46:10 tom Exp @
+  * @Id: term.5,v 1.52 2023/09/09 17:14:44 tom Exp @
 -->
 
 
 
 
 
-term 5 2023-07-01 ncurses 6.4 File formats
+term 5 2023-09-09 ncurses 6.4 File formats
 
 
 
 
-
      term 5 2023-07-01 ncurses 6.4 File formats
      
+
      term 5 2023-09-09 ncurses 6.4 File formats
      
 
       term(5)                          File formats                          term(5)
 
@@ -318,29 +318,28 @@
 
        and a hexadecimal dump of the compiled terminal description:
 
-           0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
-           0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
-           0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
-           0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
-           0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
-           0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$<1
-           0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  >..=%p1% {32}%+%c
-           0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
-           0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
-
+     0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+     0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
+     0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
+     0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
+     0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
+     0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+     0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$<1
+     0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  >..=%p1% {32}%+%c
+     0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
+     0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
 
 
 
      LIMITS
      @@ -379,7 +378,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                           term(5)
+ncurses 6.4                       2023-09-09                           term(5)
 
      
 
      
 
        
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 2546d80d..f5acf53b 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.21 2023/07/01 15:21:06 tom Exp @
+  * @Id: term_variables.3x,v 1.23 2023/09/09 17:06:25 tom Exp @
 -->
 
 
 
 
 
-term_variables 3x 2023-07-01 ncurses 6.4 Library calls
+term_variables 3x 2023-09-09 ncurses 6.4 Library calls
 
 
 
 
-
        term_variables 3x 2023-07-01 ncurses 6.4 Library calls
        
+
        term_variables 3x 2023-09-09 ncurses 6.4 Library calls
        
 
         term_variables(3x)               Library calls              term_variables(3x)
 
@@ -176,7 +176,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                term_variables(3x)
+ncurses 6.4                       2023-09-09                term_variables(3x)
 
        
 
        
 
          
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 125c85be..1d21b3f5 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -32,7 +32,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.45 2023/09/02 22:30:22 tom Exp @
+  * @Id: terminfo.head,v 1.48 2023/09/09 21:34:18 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
   * Copyright 2018-2022,2023 Thomas E. Dickey                                *
@@ -62,24 +62,23 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.125 2023/09/02 22:39:26 tom Exp @
+  * @Id: terminfo.tail,v 1.130 2023/09/09 17:08:08 tom Exp @
   *.in -2
   *.in +2
   *.in -2
   *.in +2
-  *.TH
 -->
 
 
 
 
 
-terminfo 5 2023-09-02 ncurses 6.4 File formats
+terminfo 5 2023-09-09 ncurses 6.4 File formats
 
 
 
 
-
          terminfo 5 2023-09-02 ncurses 6.4 File formats
          
+
          terminfo 5 2023-09-09 ncurses 6.4 File formats
          
 
           terminfo(5)                      File formats                      terminfo(5)
 
@@ -106,7 +105,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes ncurses version 6.4 (patch 20230902).
+       This manual describes ncurses version 6.4 (patch 20230909).
 
 
 
          Terminfo Entry Syntax
          @@ -161,6 +160,7 @@
        following suffixes should be used where possible:
 
             Suffix                  Meaning                   Example
+            -------------------------------------------------------------
             -nn      Number of lines on the screen            aaa-60
             -np      Number of pages of memory                c100-4p
             -am      With automargins (usually the default)   vt100-am
@@ -285,7 +285,6 @@
                   Booleans            name      Code
 
 
-
           auto_left_margin            bw        bw     cub1 wraps from
                                                        column 0 to last
                                                        column
@@ -1679,18 +1678,18 @@
 
        These are the margin-related capabilities:
 
-                Name       Description
-                ------------------------------------------------------
-                smgl       Set left margin at current column
-                smgr       Set right margin at current column
-                smgb       Set bottom margin at current line
-                smgt       Set top margin at current line
-                smgbp      Set bottom margin at line N
-                smglp      Set left margin at column N
-                smgrp      Set right margin at column N
-                smgtp      Set top margin at line N
-                smglr      Set both left and right margins to L and R
-                smgtb      Set both top and bottom margins to T and B
+                 Name    Description
+                 ---------------------------------------------------
+                 smgl    Set left margin at current column
+                 smgr    Set right margin at current column
+                 smgb    Set bottom margin at current line
+                 smgt    Set top margin at current line
+                 smgbp   Set bottom margin at line N
+                 smglp   Set left margin at column N
+                 smgrp   Set right margin at column N
+                 smgtp   Set top margin at line N
+                 smglr   Set both left and right margins to L and R
+                 smgtb   Set both top and bottom margins to T and B
 
        When writing an application that uses these  string  capabilities,  the
        pairs  should be first checked to see if each capability in the pair is
@@ -1922,18 +1921,18 @@
 
        For example, the DEC vt220 supports most of the modes:
 
-               tparm parameter      attribute        escape sequence
-
-               none                 none             \E[0m
-               p1                   standout         \E[0;1;7m
-               p2                   underline        \E[0;4m
-               p3                   reverse          \E[0;7m
-               p4                   blink            \E[0;5m
-               p5                   dim              not available
-               p6                   bold             \E[0;1m
-               p7                   invis            \E[0;8m
-               p8                   protect          not used
-               p9                   altcharset       ^O (off) ^N (on)
+                   tparm Parameter   Attribute    Escape Sequence
+                   ------------------------------------------------
+                   none              none         \E[0m
+                   p1                standout     \E[0;1;7m
+                   p2                underline    \E[0;4m
+                   p3                reverse      \E[0;7m
+                   p4                blink        \E[0;5m
+                   p5                dim          not available
+                   p6                bold         \E[0;1m
+                   p7                invis        \E[0;8m
+                   p8                protect      not used
+                   p9                altcharset   ^O (off) ^N (on)
 
        We begin each escape sequence by turning off any existing modes,  since
        there  is  no quick way to determine whether they are active.  Standout
@@ -1950,16 +1949,16 @@
 
        Writing out the above sequences, along with their dependencies yields
 
-            sequence             when to output      terminfo translation
-
-            \E[0                 always              \E[0
-            ;1                   if p1 or p6         %?%p1%p6%|%t;1%;
-            ;4                   if p2               %?%p2%|%t;4%;
-            ;5                   if p4               %?%p4%|%t;5%;
-            ;7                   if p1 or p3         %?%p1%p3%|%t;7%;
-            ;8                   if p7               %?%p7%|%t;8%;
-            m                    always              m
-            ^N or ^O             if p9 ^N, else ^O   %?%p9%t^N%e^O%;
+                 Sequence   When to Output      terminfo Translation
+                 ----------------------------------------------------
+                 \E[0       always              \E[0
+                 ;1         if p1 or p6         %?%p1%p6%|%t;1%;
+                 ;4         if p2               %?%p2%|%t;4%;
+                 ;5         if p4               %?%p4%|%t;5%;
+                 ;7         if p1 or p3         %?%p1%p3%|%t;7%;
+                 ;8         if p7               %?%p7%|%t;8%;
+                 m          always              m
+                 ^N or ^O   if p9 ^N, else ^O   %?%p9%t^N%e^O%;
 
        Putting this all together into the sgr sequence gives:
 
@@ -2243,41 +2242,41 @@
        4410v1 added.  This alternate character set may  be  specified  by  the
        acsc capability.
 
-         Glyph                       ACS            Ascii     acsc     acsc
-         Name                        Name           Default   Char     Value
+                                                   ASCII      acsc     acsc
+         Glyph Name                 ACS Name       Fallback   Symbol   Value
          --------------------------------------------------------------------
-         arrow pointing right        ACS_RARROW     >         +        0x2b
-         arrow pointing left         ACS_LARROW     <         ,        0x2c
-         arrow pointing up           ACS_UARROW     ^         -        0x2d
-         arrow pointing down         ACS_DARROW     v         .        0x2e
-         solid square block          ACS_BLOCK      #         0        0x30
-         diamond                     ACS_DIAMOND    +         `        0x60
-         checker board (stipple)     ACS_CKBOARD    :         a        0x61
-         degree symbol               ACS_DEGREE     \         f        0x66
-         plus/minus                  ACS_PLMINUS    #         g        0x67
-         board of squares            ACS_BOARD      #         h        0x68
-         lantern symbol              ACS_LANTERN    #         i        0x69
-         lower right corner          ACS_LRCORNER   +         j        0x6a
-         upper right corner          ACS_URCORNER   +         k        0x6b
-         upper left corner           ACS_ULCORNER   +         l        0x6c
-         lower left corner           ACS_LLCORNER   +         m        0x6d
-         large plus or crossover     ACS_PLUS       +         n        0x6e
-         scan line 1                 ACS_S1         ~         o        0x6f
-         scan line 3                 ACS_S3         -         p        0x70
-         horizontal line             ACS_HLINE      -         q        0x71
-         scan line 7                 ACS_S7         -         r        0x72
-         scan line 9                 ACS_S9         _         s        0x73
-         tee pointing right          ACS_LTEE       +         t        0x74
-         tee pointing left           ACS_RTEE       +         u        0x75
-         tee pointing up             ACS_BTEE       +         v        0x76
-         tee pointing down           ACS_TTEE       +         w        0x77
-         vertical line               ACS_VLINE      |         x        0x78
-         less-than-or-equal-to       ACS_LEQUAL     <         y        0x79
-         greater-than-or-equal-to    ACS_GEQUAL     >         z        0x7a
-         greek pi                    ACS_PI         *         {        0x7b
-         not-equal                   ACS_NEQUAL     !         |        0x7c
-         UK pound sign               ACS_STERLING   f         }        0x7d
-         bullet                      ACS_BULLET     o         ~        0x7e
+         arrow pointing right       ACS_RARROW     >          +        0x2b
+         arrow pointing left        ACS_LARROW     <          ,        0x2c
+         arrow pointing up          ACS_UARROW     ^          -        0x2d
+         arrow pointing down        ACS_DARROW     v          .        0x2e
+         solid square block         ACS_BLOCK      #          0        0x30
+         diamond                    ACS_DIAMOND    +          `        0x60
+         checker board (stipple)    ACS_CKBOARD    :          a        0x61
+         degree symbol              ACS_DEGREE     \          f        0x66
+         plus/minus                 ACS_PLMINUS    #          g        0x67
+         board of squares           ACS_BOARD      #          h        0x68
+         lantern symbol             ACS_LANTERN    #          i        0x69
+         lower right corner         ACS_LRCORNER   +          j        0x6a
+         upper right corner         ACS_URCORNER   +          k        0x6b
+         upper left corner          ACS_ULCORNER   +          l        0x6c
+         lower left corner          ACS_LLCORNER   +          m        0x6d
+         large plus or crossover    ACS_PLUS       +          n        0x6e
+         scan line 1                ACS_S1         ~          o        0x6f
+         scan line 3                ACS_S3         -          p        0x70
+         horizontal line            ACS_HLINE      -          q        0x71
+         scan line 7                ACS_S7         -          r        0x72
+         scan line 9                ACS_S9         _          s        0x73
+         tee pointing right         ACS_LTEE       +          t        0x74
+         tee pointing left          ACS_RTEE       +          u        0x75
+         tee pointing up            ACS_BTEE       +          v        0x76
+         tee pointing down          ACS_TTEE       +          w        0x77
+         vertical line              ACS_VLINE      |          x        0x78
+         less-than-or-equal-to      ACS_LEQUAL     <          y        0x79
+         greater-than-or-equal-to   ACS_GEQUAL     >          z        0x7a
+         greek pi                   ACS_PI         *          {        0x7b
+         not-equal                  ACS_NEQUAL     !          |        0x7c
+         UK pound sign              ACS_STERLING   f          }        0x7d
+         bullet                     ACS_BULLET     o          ~        0x7e
 
        A few notes apply to the table itself:
 
@@ -2358,28 +2357,30 @@
        free  to  map  these  as  it  likes, but the RGB values indicate normal
        locations in color space.
 
-                    Color       #define       Value       RGB
-                    black     COLOR_BLACK       0     0, 0, 0
-                    red       COLOR_RED         1     max,0,0
-                    green     COLOR_GREEN       2     0,max,0
-                    yellow    COLOR_YELLOW      3     max,max,0
-                    blue      COLOR_BLUE        4     0,0,max
-                    magenta   COLOR_MAGENTA     5     max,0,max
-                    cyan      COLOR_CYAN        6     0,max,max
-                    white     COLOR_WHITE       7     max,max,max
+                    Color      #define       Value        RGB
+                   ------------------------------------------------
+                   black     COLOR_BLACK       0     0,   0,   0
+                   red       COLOR_RED         1     max, 0,   0
+                   green     COLOR_GREEN       2     0,   max, 0
+                   yellow    COLOR_YELLOW      3     max, max, 0
+                   blue      COLOR_BLUE        4     0,   0,   max
+                   magenta   COLOR_MAGENTA     5     max, 0,   max
+                   cyan      COLOR_CYAN        6     0,   max, max
+                   white     COLOR_WHITE       7     max, max, max
 
        The argument values of setf/setb historically correspond to a different
        mapping, i.e.,
 
-                    Color       #define       Value       RGB
-                    black     COLOR_BLACK       0     0, 0, 0
-                    blue      COLOR_BLUE        1     0,0,max
-                    green     COLOR_GREEN       2     0,max,0
-                    cyan      COLOR_CYAN        3     0,max,max
-                    red       COLOR_RED         4     max,0,0
-                    magenta   COLOR_MAGENTA     5     max,0,max
-                    yellow    COLOR_YELLOW      6     max,max,0
-                    white     COLOR_WHITE       7     max,max,max
+                    Color      #define       Value        RGB
+                   ------------------------------------------------
+                   black     COLOR_BLACK       0     0,   0,   0
+                   blue      COLOR_BLUE        1     0,   0,   max
+                   green     COLOR_GREEN       2     0,   max, 0
+                   cyan      COLOR_CYAN        3     0,   max, max
+                   red       COLOR_RED         4     max, 0,   0
+                   magenta   COLOR_MAGENTA     5     max, 0,   max
+                   yellow    COLOR_YELLOW      6     max, max, 0
+                   white     COLOR_WHITE       7     max, max, max
 
        It  is  important  to  not  confuse the two sets of color capabilities;
        otherwise red/blue will be interchanged on the display.
@@ -2409,23 +2410,25 @@
        of  attributes  not  to  be  used  when  colors   are   enabled.    The
        correspondence with the attributes understood by curses is as follows:
 
-                  Attribute              Bit   Decimal      Set by
-                  A_STANDOUT             0     1            sgr
-                  A_UNDERLINE            1     2            sgr
-                  A_REVERSE              2     4            sgr
-                  A_BLINK                3     8            sgr
-                  A_DIM                  4     16           sgr
-                  A_BOLD                 5     32           sgr
-                  A_INVIS                6     64           sgr
-                  A_PROTECT              7     128          sgr
-                  A_ALTCHARSET           8     256          sgr
-                  A_HORIZONTAL           9     512          sgr1
-                  A_LEFT                 10    1024         sgr1
-                  A_LOW                  11    2048         sgr1
-                  A_RIGHT                12    4096         sgr1
-                  A_TOP                  13    8192         sgr1
-                  A_VERTICAL             14    16384        sgr1
-                  A_ITALIC               15    32768        sitm
+                         Attribute     Bit   Decimal   Set by
+                        --------------------------------------
+                        A_STANDOUT      0         1    sgr
+                        A_UNDERLINE     1         2    sgr
+                        A_REVERSE       2         4    sgr
+                        A_BLINK         3         8    sgr
+                        A_DIM           4        16    sgr
+                        A_BOLD          5        32    sgr
+                        A_INVIS         6        64    sgr
+                        A_PROTECT       7       128    sgr
+                        A_ALTCHARSET    8       256    sgr
+                        A_HORIZONTAL    9       512    sgr1
+                        A_LEFT         10      1024    sgr1
+                        A_LOW          11      2048    sgr1
+                        A_RIGHT        12      4096    sgr1
+                        A_TOP          13      8192    sgr1
+
+                        A_VERTICAL     14     16384    sgr1
+                        A_ITALIC       15     32768    sitm
 
        For  example, on many IBM PC consoles, the underline attribute collides
        with the foreground color blue and is  not  available  in  color  mode.
@@ -2689,7 +2692,7 @@
 
 
 
-ncurses 6.4                       2023-09-02                       terminfo(5)
+ncurses 6.4                       2023-09-09                       terminfo(5)

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 8bc33b65..272fecd2 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: toe.1m,v 1.40 2023/07/01 15:46:10 tom Exp @
+  * @Id: toe.1m,v 1.42 2023/09/09 21:15:25 tom Exp @
 -->
 
 
 
 
 
-toe 1m 2023-07-01 ncurses 6.4 User commands
+toe 1m 2023-09-09 ncurses 6.4 User commands
 
 
 
 
-
toe 1m 2023-07-01 ncurses 6.4 User commands

+
toe 1m 2023-09-09 ncurses 6.4 User commands

 
 toe(1m)                          User commands                         toe(1m)
 
@@ -171,11 +171,11 @@
        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
        terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
-ncurses 6.4                       2023-07-01                           toe(1m)
+ncurses 6.4                       2023-09-09                           toe(1m)
 

 

 
    
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index e282a641..2fcbfb04 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 0fb0c86f..138286c7 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@
        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.4 (patch 20230902).
+       This describes ncurses version 6.4 (patch 20230909).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 8fd38a4a..1ef43321 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.30 2023/08/19 20:39:40 tom Exp @
+  * @Id: user_caps.5,v 1.32 2023/09/09 21:25:30 tom Exp @
 -->
 
 
 
 
 
-user_caps 5 2023-08-19 ncurses 6.4 File formats
+user_caps 5 2023-09-09 ncurses 6.4 File formats
 
 
 
 
-
user_caps 5 2023-08-19 ncurses 6.4 File formats

+
user_caps 5 2023-09-09 ncurses 6.4 File formats

 
 user_caps(5)                     File formats                     user_caps(5)
 
@@ -394,7 +394,7 @@
 
 
 
-ncurses 6.4                       2023-08-19                      user_caps(5)
+ncurses 6.4                       2023-09-09                      user_caps(5)
 

 

 
    
diff --git a/man/MKada_config.in b/man/MKada_config.in
index 3a2986fa..f1a956a7 100644
--- a/man/MKada_config.in
+++ b/man/MKada_config.in
@@ -27,9 +27,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: MKada_config.in,v 1.16 2023/08/19 19:12:34 tom Exp $
+.\" $Id: MKada_config.in,v 1.18 2023/09/09 23:32:29 tom Exp $
 .ds C adacurses@USE_CFG_SUFFIX@\-config
-.TH ADACURSES 1 2023-08-19 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.TH ADACURSES 1 2023-09-09 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .SH NAME
 adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries
 .SH SYNOPSIS
@@ -64,7 +69,7 @@ program for @ADA_LIBNAME@.
 Make a file named "hello.adb":
 .RS
 .nf
-.ft CW
+.ft \*(CW
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 
 procedure Hello is
@@ -103,14 +108,14 @@ end Hello;
 .PP
 Then, using
 .RS
-.ft CW
+.ft \*(CW
 gnatmake `adacurses-config --cflags` hello -largs `adacurses-config --libs`
 .ft
 .RE
 .PP
 or (simpler):
 .RS
-.ft CW
+.ft \*(CW
 gnatmake hello `adacurses-config`
 .ft
 .RE
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index c5ff2ac4..55b43f32 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.37 2023/08/19 20:36:21 tom Exp $
-.TH @CAPTOINFO@ 1M 2023-08-19 "ncurses 6.4" "User commands"
+.\" $Id: captoinfo.1m,v 1.39 2023/09/09 16:40:25 tom Exp $
+.TH @CAPTOINFO@ 1M 2023-09-09 "ncurses 6.4" "User commands"
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -79,12 +79,12 @@ will issue an notification to stderr, inviting the user to check that
 it has not mistakenly translated a completely unknown and random
 capability and/or syntax error.
 .PP
-.TS H
-c c c c
-c c c c
-l l l l.
-Nonstd	Std	From	Terminfo
-name	name		capability
+.TS
+cb cb cb cb
+cb cb cb cb
+l  l  l  l .
+Nonstd	Std	\&	Terminfo
+name	name	From	capability
 _
 BO	mr	AT&T	enter_reverse_mode
 CI	vi	AT&T	cursor_invisible
@@ -121,8 +121,8 @@ for forms drawing, designed to take advantage of the IBM PC
 high-half graphics.
 They were as follows:
 .PP
-.TS H
-c c
+.TS
+cb cb
 l l.
 Cap	Graphic
 _
@@ -162,8 +162,8 @@ The following AIX extensions are automatically
 translated:
 .PP
 .TS
-c c
-l l.
+cb cb
+l  l .
 IBM	XSI
 _
 ksel	kslt
diff --git a/man/clear.1 b/man/clear.1
index 830560bd..3498dc7d 100644
--- a/man/clear.1
+++ b/man/clear.1
@@ -27,8 +27,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: clear.1,v 1.33 2023/07/01 14:23:04 tom Exp $
-.TH @CLEAR@ 1 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: clear.1,v 1.35 2023/09/09 21:12:26 tom Exp $
+.TH @CLEAR@ 1 2023-09-09 "ncurses 6.4" "User commands"
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .\" these would be fallbacks for DS/DE,
 .\" but groff changed the meaning of the macros.
 .de NS
@@ -37,7 +42,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index ca75a2f6..0795102e 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -28,19 +28,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.78 2023/08/19 20:37:30 tom Exp $
-.TH curs_attr 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.\" $Id: curs_attr.3x,v 1.80 2023/09/09 21:13:26 tom Exp $
+.TH curs_attr 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index 6d8c87db..731e6e5e 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -28,18 +28,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_mouse.3x,v 1.64 2023/07/01 15:43:20 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.66 2023/09/09 21:13:51 tom Exp $
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -51,7 +56,7 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH curs_mouse 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.TH curs_mouse 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .na
 .hy 0
 .SH NAME
diff --git a/man/default_colors.3x b/man/default_colors.3x
index a90947dd..f60740e4 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+.\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -29,7 +29,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.37 2023/08/19 19:48:15 tom Exp $
+.\" $Id: default_colors.3x,v 1.38 2023/08/19 19:48:15 tom Exp $
 .TH default_colors 3X 2023-08-19 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
diff --git a/man/infocmp.1m b/man/infocmp.1m
index 5537a4e8..582cd7ec 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.88 2023/09/02 22:29:02 tom Exp $
-.TH @INFOCMP@ 1M 2023-09-02 "ncurses 6.4" "User commands"
+.\" $Id: infocmp.1m,v 1.90 2023/09/09 21:14:05 tom Exp $
+.TH @INFOCMP@ 1M 2023-09-09 "ncurses 6.4" "User commands"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,13 +39,18 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 86361f9b..5bd9d5f5 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,13 +28,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.164 2023/08/19 19:23:43 tom Exp $
+.\" $Id: ncurses.3x,v 1.167 2023/09/09 21:11:08 tom Exp $
 .hy 0
-.TH ncurses 3X 2023-08-19 "ncurses 6.4" "Library calls"
+.TH ncurses 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,7 +50,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -1036,7 +1041,7 @@ ncurses checks for an extended terminfo capability \fBU8\fP.
 This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP.
 For example
 .RS 3
-.ft CW
+.ft \*(CW
 .sp
 .nf
 # linux console, if patched to provide working
@@ -1048,7 +1053,7 @@ linux-vt100|linux console with VT100 line-graphics,
 xterm-utf8|xterm relying on UTF-8 line-graphics,
         U8#1, use=xterm,
 .fi
-.ft
+.ft R
 .RE
 .PP
 The name \*(``U8\*('' is chosen to be two characters,
diff --git a/man/new_pair.3x b/man/new_pair.3x
index 036a8a29..38203fd8 100644
--- a/man/new_pair.3x
+++ b/man/new_pair.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: new_pair.3x,v 1.24 2023/07/01 15:46:10 tom Exp $
-.TH new_pair 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: new_pair.3x,v 1.26 2023/09/09 21:20:16 tom Exp $
+.TH new_pair 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -39,13 +39,18 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/scr_dump.5 b/man/scr_dump.5
index cd8f741d..2a2203be 100644
--- a/man/scr_dump.5
+++ b/man/scr_dump.5
@@ -27,19 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: scr_dump.5,v 1.25 2023/07/01 15:46:10 tom Exp $
-.TH scr_dump 5 2023-07-01 "ncurses 6.4" "File formats"
+.\" $Id: scr_dump.5,v 1.27 2023/09/09 21:20:16 tom Exp $
+.TH scr_dump 5 2023-09-09 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/tabs.1 b/man/tabs.1
index b834615d..8b83c1d0 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.39 2023/07/01 15:46:10 tom Exp $
-.TH @TABS@ 1 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: tabs.1,v 1.41 2023/09/09 21:19:07 tom Exp $
+.TH @TABS@ 1 2023-09-09 "ncurses 6.4" "User commands"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -38,13 +38,18 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/term.5 b/man/term.5
index 97070a18..d8ba7ac7 100644
--- a/man/term.5
+++ b/man/term.5
@@ -27,19 +27,24 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.48 2023/07/01 15:46:10 tom Exp $
-.TH term 5 2023-07-01 "ncurses 6.4" "File formats"
+.\" $Id: term.5,v 1.52 2023/09/09 17:14:44 tom Exp $
+.TH term 5 2023-09-09 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -353,9 +358,12 @@ adm3a|lsi adm3a,
 .NE
 .PP
 and a hexadecimal dump of the compiled terminal description:
-.NS
-.ft CW
-\s-20000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+.PP
+.ie n .in -2n
+.el   .in +4n
+.TS
+lp-1f(\*(CW).
+0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
 0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
 0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
 0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
@@ -376,10 +384,9 @@ and a hexadecimal dump of the compiled terminal description:
 0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$<1
 0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  >..=%p1% {32}%+%c
 0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
-0150  00 08 00 0c 00 0b 00 0a  00                       ........ .\s+2
-.ft R
-.NE
-.sp
+0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
+.TE
+.in
 .SH LIMITS
 Some limitations:
 .bP
diff --git a/man/term_variables.3x b/man/term_variables.3x
index 76dc5347..68028cb0 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -27,13 +27,18 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.21 2023/07/01 15:21:06 tom Exp $
-.TH term_variables 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: term_variables.3x,v 1.23 2023/09/09 17:06:25 tom Exp $
+.TH term_variables 3X 2023-09-09 "ncurses 6.4" "Library calls"
 .ds n 5
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .na
 .hy 0
 .SH NAME
@@ -152,7 +157,7 @@ These are in terms of the symbol \fBCUR\fP,
 which is defined
 .PP
 .nf
-.ft CW
+.ft \*(CW
 #define CUR ((TERMTYPE *)(cur_term))->
 .fi
 .ft R
diff --git a/man/terminfo.head b/man/terminfo.head
index b04e2df8..ab24174e 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -27,14 +27,23 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.45 2023/09/02 22:30:22 tom Exp $
-.TH terminfo 5 2023-09-02 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: terminfo.head,v 1.48 2023/09/09 21:34:18 tom Exp $
+.TH terminfo 5 2023-09-09 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ds n 5
 .ds d @TERMINFO@
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie \n(.g .ds ^ \(ha
+.el       .ds ^ ^
+.ie \n(.g .ds ~ \(ti
+.el       .ds ~ ~
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -45,7 +54,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft C			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -135,10 +144,11 @@ Thus, a vt100 in 132-column mode would be vt100\-w.
 The following suffixes should be used where possible:
 .PP
 .TS
-center ;
-l c l
-l l l.
-\fBSuffix	Meaning	Example\fP
+center;
+lb cb lb
+l  l  l .
+Suffix	Meaning	Example
+_
 \-\fInn\fP	Number of lines on the screen	aaa\-60
 \-\fIn\fPp	Number of pages of memory	c100\-4p
 \-am	With automargins (usually the default)	vt100\-am
diff --git a/man/terminfo.tail b/man/terminfo.tail
index b2715770..05c0426a 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.125 2023/09/02 22:39:26 tom Exp $
+.\" $Id: terminfo.tail,v 1.130 2023/09/09 17:08:08 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -85,7 +85,7 @@ The following entry, describing an ANSI-standard terminal, is representative
 of what a \fBterminfo\fP entry for a modern terminal typically looks like.
 .PP
 .nf
-.ft CW
+.ft \*(CW
 \s-2ansi|ansi/pc-term compatible with color,
         am, mc5i, mir, msgr,
         colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
@@ -287,7 +287,7 @@ the system terminfo directory, \fI\*d\fP
 The \fBTERMINFO\fP variable can contain a terminal description instead
 of the pathname of a terminal database.
 If this variable begins with \*(``hex:\*('' or \*(``b64:\*(''
-then \fBncurses\fP reads a terminal description from 
+then \fBncurses\fP reads a terminal description from
 hexadecimal- or base64-encoded data,
 and if that description matches the name sought, will use that.
 This encoded data can be set using the \*(``\-Q\*('' option of
@@ -434,7 +434,7 @@ Thus the model 33 teletype is described as
 .PP
 .DT
 .nf
-.ft CW
+.ft \*(CW
 .\".in -2
 \s-133\||\|tty33\||\|tty\||\|model 33 teletype,
         bel=^G, cols#72, cr=^M, cud1=^J, hc, ind=^J, os,\s+1
@@ -446,7 +446,7 @@ while the Lear Siegler \s-1ADM-3\s0 is described as
 .PP
 .DT
 .nf
-.ft CW
+.ft \*(CW
 .\".in -2
 \s-1adm3\||\|3\||\|lsi adm3,
         am, bel=^G, clear=^Z, cols#80, cr=^M, cub1=^H, cud1=^J,
@@ -488,7 +488,7 @@ as in \fBprintf\fP(3), flags are \fI[\-+#]\fP and \fIspace\fP.
 Use a \*(``:\*('' to allow the next character to be a \*(``\-\*('' flag,
 avoiding interpreting \*(``%\-\*('' as an operator.
 .TP
-\f(CW%c\fP
+\f\*(CW%c\fP
 print \fIpop()\fP like %c in \fBprintf\fP
 .TP
 \fB%s\fP
@@ -739,12 +739,13 @@ If either is omitted, the corresponding margin is set to the left or
 right edge of the display (rather than leaving the margin unmodified).
 .PP
 These are the margin-related capabilities:
+.PP
 .TS
 center;
-l l
-_ _
-lw8 lw18.
-\fBName	Description\fP
+lb lb
+lb l .
+Name	Description
+_
 smgl	Set left margin at current column
 smgr	Set right margin at current column
 smgb	Set bottom margin at current line
@@ -1085,19 +1086,18 @@ For example, the DEC vt220 supports most of the modes:
 .PP
 .TS
 center;
-l l l
-l l l
-lw18 lw14 lw18.
-\fBtparm parameter	attribute	escape sequence\fP
-
-none	none	\\E[0m
-p1	standout	\\E[0;1;7m
-p2	underline	\\E[0;4m
-p3	reverse	\\E[0;7m
-p4	blink	\\E[0;5m
+lb lb lb
+l  l  l .
+tparm Parameter	Attribute	Escape Sequence
+_
+none	none	\eE[0m
+p1	standout	\eE[0;1;7m
+p2	underline	\eE[0;4m
+p3	reverse	\eE[0;7m
+p4	blink	\eE[0;5m
 p5	dim	not available
-p6	bold	\\E[0;1m
-p7	invis	\\E[0;8m
+p6	bold	\eE[0;1m
+p7	invis	\eE[0;8m
 p8	protect	not used
 p9	altcharset	^O (off) ^N (on)
 .TE
@@ -1121,12 +1121,10 @@ Writing out the above sequences, along with their dependencies yields
 .ne 11
 .TS
 center;
-l l l
-l l l
-lw18 lw14 lw18.
-\fBsequence	when to output	terminfo translation\fP
-
-.ft CW
+lb lb lb
+l  l  l .
+Sequence	When to Output	terminfo Translation
+_
 \\E[0	always	\\E[0
 ;1	if p1 or p6	%?%p1%p6%|%t;1%;
 ;4	if p2	%?%p2%|%t;4%;
@@ -1134,13 +1132,12 @@ lw18 lw14 lw18.
 ;7	if p1 or p3	%?%p1%p3%|%t;7%;
 ;8	if p7	%?%p7%|%t;8%;
 m	always	m
-^N or ^O	if p9 ^N, else ^O	%?%p9%t^N%e^O%;
-.ft R
+\*^N or \*^O	if p9 \*^N, else \*^O	%?%p9%t\*^N%e\*^O%;
 .TE
 .PP
 Putting this all together into the sgr sequence gives:
 .PP
-.ft CW
+.ft \*(CW
 .nf
     sgr=\\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
         %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\\016%e\\017%;,
@@ -1551,18 +1548,17 @@ for most of the drawing characters
 supported by the VT100, with some characters from the AT&T 4410v1 added.
 This alternate character set may be specified by the \fBacsc\fP capability.
 .PP
-.TS H
-center expand;
-l l l l l
-l l l l l
-_ _ _ _ _
-lw25 lw10 lw6 lw6 lw6.
-.\".TH
-\fBGlyph	ACS	Ascii	acsc	acsc\fP
-\fBName	Name	Default	Char	Value\fP
+.TS
+center;
+lb lb lb lb lb.
+\&	\&	ASCII	acsc	acsc
+Glyph Name	ACS Name	Fallback	Symbol	Value
+_
+.T&
+l  lb l  l  l .
 arrow pointing right	ACS_RARROW	>	+	0x2b
 arrow pointing left	ACS_LARROW	<	,	0x2c
-arrow pointing up	ACS_UARROW	^	\-	0x2d
+arrow pointing up	ACS_UARROW	\*^	\-	0x2d
 arrow pointing down	ACS_DARROW	v	.	0x2e
 solid square block	ACS_BLOCK	#	0	0x30
 diamond         	ACS_DIAMOND	+	`	0x60
@@ -1576,7 +1572,7 @@ upper right corner	ACS_URCORNER	+	k	0x6b
 upper left corner	ACS_ULCORNER	+	l	0x6c
 lower left corner	ACS_LLCORNER	+	m	0x6d
 large plus or crossover	ACS_PLUS	+	n	0x6e
-scan line 1     	ACS_S1  	~	o	0x6f
+scan line 1     	ACS_S1  	\*~	o	0x6f
 scan line 3     	ACS_S3  	\-	p	0x70
 horizontal line 	ACS_HLINE	\-	q	0x71
 scan line 7     	ACS_S7  	\-	r	0x72
@@ -1591,7 +1587,7 @@ greater-than-or-equal-to	ACS_GEQUAL	>	z	0x7a
 greek pi        	ACS_PI	*	{	0x7b
 not-equal       	ACS_NEQUAL	!	|	0x7c
 UK pound sign        	ACS_STERLING	f	}	0x7d
-bullet          	ACS_BULLET	o	~	0x7e
+bullet          	ACS_BULLET	o	\*~	0x7e
 .TE
 .PP
 A few notes apply to the table itself:
@@ -1683,36 +1679,39 @@ The terminal hardware is free to
 map these as it likes, but the RGB values indicate normal locations in color
 space.
 .PP
-.TS H
+.TS
 center;
-l c c c
-l l n l.
-\fBColor	#define 	Value	RGB\fP
-black	\fBCOLOR_BLACK\fP	0	0, 0, 0
-red	\fBCOLOR_RED\ \fP	1	max,0,0
-green	\fBCOLOR_GREEN\fP	2	0,max,0
-yellow	\fBCOLOR_YELLOW\fP	3	max,max,0
-blue	\fBCOLOR_BLUE\fP	4	0,0,max
-magenta	\fBCOLOR_MAGENTA\fP	5	max,0,max
-cyan	\fBCOLOR_CYAN\fP	6	0,max,max
-white	\fBCOLOR_WHITE\fP	7	max,max,max
+cb cb cb cb s  s
+l  lb c  l1 l1 l .
+Color	#define 	Value	RGB
+_
+black	COLOR_BLACK	0	0,	0,	0
+red	COLOR_RED	1	max,	0,	0
+green	COLOR_GREEN	2	0,	max,	0
+yellow	COLOR_YELLOW	3	max,	max,	0
+blue	COLOR_BLUE	4	0,	0,	max
+magenta	COLOR_MAGENTA	5	max,	0,	max
+cyan	COLOR_CYAN	6	0,	max,	max
+white	COLOR_WHITE	7	max,	max,	max
 .TE
 .PP
 The argument values of \fBsetf\fP/\fBsetb\fP historically correspond to
 a different mapping, i.e.,
-.TS H
+.PP
+.TS
 center;
-l c c c
-l l n l.
-\fBColor	#define 	Value	RGB\fP
-black	\fBCOLOR_BLACK\fP	0	0, 0, 0
-blue	\fBCOLOR_BLUE\fP	1	0,0,max
-green	\fBCOLOR_GREEN\fP	2	0,max,0
-cyan	\fBCOLOR_CYAN\fP	3	0,max,max
-red	\fBCOLOR_RED\ \fP	4	max,0,0
-magenta	\fBCOLOR_MAGENTA\fP	5	max,0,max
-yellow	\fBCOLOR_YELLOW\fP	6	max,max,0
-white	\fBCOLOR_WHITE\fP	7	max,max,max
+cb cb cb cb s  s
+l  lb c  l1 l1 l .
+Color	#define 	Value	RGB
+_
+black	COLOR_BLACK	0	0,	0,	0
+blue	COLOR_BLUE	1	0,	0,	max
+green	COLOR_GREEN	2	0,	max,	0
+cyan	COLOR_CYAN	3	0,	max,	max
+red	COLOR_RED	4	max,	0,	0
+magenta	COLOR_MAGENTA	5	max,	0,	max
+yellow	COLOR_YELLOW	6	max,	max,	0
+white	COLOR_WHITE	7	max,	max,	max
 .TE
 .PP
 It is important to not confuse the two sets of color capabilities;
@@ -1753,16 +1752,17 @@ attributes understood by \fBcurses\fP is as follows:
 .PP
 .TS
 center;
-l l l l
-lw20 lw2 lw10 lw10.
-\fBAttribute	Bit	Decimal	Set by\fP
+cb cb cb cb
+lb n  n  lb.
+Attribute	Bit	Decimal	Set by
+_
 A_STANDOUT	0	1	sgr
 A_UNDERLINE	1	2	sgr
 A_REVERSE	2	4	sgr
-A_BLINK   	3	8	sgr
-A_DIM      	4	16	sgr
-A_BOLD    	5	32	sgr
-A_INVIS   	6	64	sgr
+A_BLINK	3	8	sgr
+A_DIM	4	16	sgr
+A_BOLD	5	32	sgr
+A_INVIS	6	64	sgr
 A_PROTECT	7	128	sgr
 A_ALTCHARSET	8	256	sgr
 A_HORIZONTAL	9	512	sgr1
diff --git a/man/toe.1m b/man/toe.1m
index 63f0053c..f67566b7 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: toe.1m,v 1.40 2023/07/01 15:46:10 tom Exp $
-.TH @TOE@ 1M 2023-07-01 "ncurses 6.4" "User commands"
+.\" $Id: toe.1m,v 1.42 2023/09/09 21:15:25 tom Exp $
+.TH @TOE@ 1M 2023-09-09 "ncurses 6.4" "User commands"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -37,13 +37,18 @@
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
 .de NS
 .ie n  .sp
 .el    .sp .5
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
diff --git a/man/user_caps.5 b/man/user_caps.5
index 8dcfd607..0ca74be8 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,26 +28,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.30 2023/08/19 20:39:40 tom Exp $
-.TH user_caps 5 2023-08-19 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.32 2023/09/09 21:25:30 tom Exp $
+.TH user_caps 5 2023-09-09 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
-.de NS
-.ie n  .sp
-.el    .sp .5
-.ie n  .in +4
-.el    .in +2
-.nf
-.ft CR			\" Courier
-..
-.de NE
-.fi
-.ft R
-.ie n  .in -4
-.el    .in -2
-..
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/misc/ncu2openbsd b/misc/ncu2openbsd
index b066a105..0c3365d7 100755
--- a/misc/ncu2openbsd
+++ b/misc/ncu2openbsd
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
-# $Id: ncu2openbsd,v 1.65 2021/10/03 18:52:22 tom Exp $
+# $Id: ncu2openbsd,v 1.67 2023/09/09 15:59:17 tom Exp $
 # -----------------------------------------------------------------------------
-# Copyright 2021 by Thomas E. Dickey
+# Copyright 2021,2023 by Thomas E. Dickey
 #
 #                         All Rights Reserved
 #
@@ -44,7 +44,7 @@ use File::Temp qw/ tempdir /;
 
 $| = 1;
 
-our ( $opt_d, $opt_n, $opt_r, $opt_t, $opt_v, $opt_x );
+our ( $opt_d, $opt_n, $opt_r, $opt_t, $opt_v, $opt_x, $opt_6 );
 our $source_dir;
 our $target_dir;
 our $update_dir;
@@ -1177,12 +1177,12 @@ sub configure_tree() {
     my @search = ( "/usr/share/terminfo", "/usr/local/share/terminfo" );
     my @prefix = ("./configure");
     $prefix[ ++$#prefix ] = "--with-abi-version=5"
-      if ( &patchdate >= 20150502 );
+      if ( &patchdate >= 20150502 && !$opt_6 );
     my @options = (
-        "--with-ospeed=int",    #
-        "--with-shared",        #
-        "--without-normal",     #
-        "--without-debug",      #
+        "--with-ospeed=int",                               #
+        "--with-shared",                                   #
+        "--without-normal",                                #
+        "--without-debug",                                 #
         "--with-terminfo-dirs=" . join( ':', @search ),    #
         "--without-ada",                                   #
         "--disable-hard-tabs",                             #
@@ -1191,7 +1191,8 @@ sub configure_tree() {
         "--enable-bsdpad",                                 #
         "--enable-signed-char",                            #
         "--enable-termcap",                                #
-        "--enable-widec"
+        "--enable-widec",                                  #
+        "--disable-setuid-environ"
     );
     $options[ ++$#options ] = "--with-trace" if ($opt_t);
     $options[ ++$#options ] = "--enable-string-hacks"
@@ -1250,6 +1251,7 @@ sub usage() {
 Usage: ncu2openbsd [options] [sourcetree]
 
 Options:
+  -6       use ABI 6 rather than 5 if available
   -d DST   specify destination (default: /usr/src)
   -n       no-op, do not update destination
   -r       remove update, restore sources from ".orig"
@@ -1261,7 +1263,7 @@ EOF
 }
 
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
-&getopts('d:nrtvx') || &usage();
+&getopts('6d:nrtvx') || &usage();
 $opt_d = "/usr/src" unless ($opt_d);
 &usage() unless ( $#ARGV <= 0 );
 
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 1a7fa608..0c09d263 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.671 2023/08/26 19:01:27 tom Exp $
+ * $Id: curses.priv.h,v 1.672 2023/09/09 23:13:32 tom Exp $
  *
  *	curses.priv.h
  *
@@ -146,7 +146,7 @@ extern int errno;
 # define PRIxPTR	"lX"
 # define CASTxPTR(n)    (unsigned long)(intptr_t)(void*)(n)
 #else
-# define CASTxPTR(n)    (intptr_t)(void*)(n)
+# define CASTxPTR(n)    (intptr_t)(n)
 #endif
 
 #ifndef PRIxPTR
diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index d5148ca6..55f51fb6 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -48,7 +48,7 @@
 
 #include 
 
-MODULE_ID("$Id: alloc_entry.c,v 1.77 2022/10/15 19:37:33 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.78 2023/09/09 16:06:00 Nicholas.Marriott Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -251,7 +251,7 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     TERMTYPE2 *from = &(source->tterm);
 #if NCURSES_XNAMES
     TERMTYPE2 copy;
-    size_t str_size;
+    size_t str_size, copy_size;
     char *str_table;
 #endif
     unsigned i;
@@ -285,21 +285,27 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
 	if ((str_table = malloc(str_size)) == NULL)
 	    _nc_err_abort(MSG_NO_MEMORY);
 	str_copied = str_table;
-	strcpy(str_copied, to->term_names);
+	_nc_STRCPY(str_copied, to->term_names, str_size);
 	to->term_names = str_copied;
-	str_copied += strlen(str_copied) + 1;
+	copy_size = strlen(str_copied) + 1;
+	str_copied += copy_size;
+	str_size -= copy_size;
 	for_each_string(i, from) {
 	    if (VALID_STRING(from->Strings[i])) {
-		strcpy(str_copied, from->Strings[i]);
+		_nc_STRCPY(str_copied, from->Strings[i], str_size);
 		from->Strings[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	for_each_string(i, to) {
 	    if (VALID_STRING(to->Strings[i])) {
-		strcpy(str_copied, to->Strings[i]);
+		_nc_STRCPY(str_copied, to->Strings[i], str_size);
 		to->Strings[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	free(to->str_table);
@@ -330,16 +336,20 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
 	str_copied = str_table;
 	for (i = 0; i < NUM_EXT_NAMES(from); ++i) {
 	    if (VALID_STRING(from->ext_Names[i])) {
-		strcpy(str_copied, from->ext_Names[i]);
+		_nc_STRCPY(str_copied, from->ext_Names[i], str_size);
 		from->ext_Names[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	for (i = 0; i < NUM_EXT_NAMES(to); ++i) {
 	    if (VALID_STRING(to->ext_Names[i])) {
-		strcpy(str_copied, to->ext_Names[i]);
+		_nc_STRCPY(str_copied, to->ext_Names[i], str_size);
 		to->ext_Names[i] = str_copied;
-		str_copied += strlen(str_copied) + 1;
+		copy_size = strlen(str_copied) + 1;
+		str_copied += copy_size;
+		str_size -= copy_size;
 	    }
 	}
 	free(to->ext_str_table);
diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index ff32770d..304c1b62 100644
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -43,7 +43,7 @@
 
 #include 
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.49 2023/05/27 20:13:10 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.51 2023/09/09 23:15:53 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -530,6 +530,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
     unsigned i;
     int pass;
     char *new_table;
+    size_t new_table_size;
 #if NCURSES_EXT_NUMBERS
     short *oldptr = 0;
     int *newptr = 0;
@@ -550,19 +551,24 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	   NUM_STRINGS(dst) * sizeof(dst->Strings[0]));
 
     new_table = NULL;
+    new_table_size = 0;
     for (pass = 0; pass < 2; ++pass) {
 	size_t str_size = 0;
 	if (src->term_names != NULL) {
 	    if (pass) {
 		dst->term_names = new_table + str_size;
-		strcpy(dst->term_names + str_size, src->term_names);
+		_nc_STRCPY(dst->term_names + str_size,
+			   src->term_names,
+			   new_table_size - str_size);
 	    }
 	    str_size += strlen(src->term_names) + 1;
 	}
 	for_each_string(i, src) {
 	    if (VALID_STRING(src->Strings[i])) {
 		if (pass) {
-		    strcpy(new_table + str_size, src->Strings[i]);
+		    _nc_STRCPY(new_table + str_size,
+			       src->Strings[i],
+			       new_table_size - str_size);
 		    dst->Strings[i] = new_table + str_size;
 		}
 		str_size += strlen(src->Strings[i]) + 1;
@@ -574,6 +580,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	    ++str_size;
 	    if ((new_table = malloc(str_size)) == NULL)
 		_nc_err_abort(MSG_NO_MEMORY);
+	    new_table_size = str_size;
 	}
     }
 
@@ -626,6 +633,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *));
 
 	new_table = NULL;
+	new_table_size = 0;
 	for (pass = 0; pass < 2; ++pass) {
 	    size_t str_size = 0;
 	    char *raw_data = src->ext_str_table;
@@ -634,7 +642,9 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 		    size_t skip = strlen(raw_data) + 1;
 		    if (skip != 1) {
 			if (pass) {
-			    strcpy(new_table + str_size, raw_data);
+			    _nc_STRCPY(new_table + str_size,
+				       raw_data,
+				       new_table_size - str_size);
 			}
 			str_size += skip;
 			raw_data += skip;
@@ -644,7 +654,9 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 	    for (i = 0; i < NUM_EXT_NAMES(dst); ++i) {
 		if (VALID_STRING(src->ext_Names[i])) {
 		    if (pass) {
-			strcpy(new_table + str_size, src->ext_Names[i]);
+			_nc_STRCPY(new_table + str_size,
+				   src->ext_Names[i],
+				   new_table_size - str_size);
 			dst->ext_Names[i] = new_table + str_size;
 		    }
 		    str_size += strlen(src->ext_Names[i]) + 1;
@@ -656,12 +668,14 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
 		++str_size;
 		if ((new_table = calloc(str_size, 1)) == NULL)
 		    _nc_err_abort(MSG_NO_MEMORY);
+		new_table_size = str_size;
 	    }
 	}
     } else {
 	dst->ext_Names = 0;
     }
 #endif
+    (void) new_table_size;
     DEBUG(2, (T_RETURN("")));
 }
 
diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c
index 5f9c645b..2fcc4dd8 100644
--- a/ncurses/tinfo/lib_raw.c
+++ b/ncurses/tinfo/lib_raw.c
@@ -50,7 +50,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_raw.c,v 1.28 2023/08/12 15:45:07 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.29 2023/09/09 23:14:48 tom Exp $")
 
 #if HAVE_SYS_TERMIO_H
 #include 		/* needed for ISC */
@@ -397,6 +397,7 @@ intrflush(WINDOW *win GCC_UNUSED, bool flag)
 #endif
 
 #if NCURSES_EXT_FUNCS
+/* *INDENT-OFF* */
 
 /*
  * SCREEN is always opaque, but nl/raw/cbreak/echo set properties in it.
@@ -416,10 +417,10 @@ intrflush(WINDOW *win GCC_UNUSED, bool flag)
 	return ((SP_PARM != NULL) ? (what(SP_PARM) ? 1 : 0) : -1); \
     }
 
-is_TEST(is_nl, IsNl);
-is_TEST(is_raw, IsRaw);
-is_TEST(is_cbreak, IsCbreak);
-is_TEST(is_echo, IsEcho);
+is_TEST(is_nl, IsNl)
+is_TEST(is_raw, IsRaw)
+is_TEST(is_cbreak, IsCbreak)
+is_TEST(is_echo, IsEcho)
 
 #if NCURSES_SP_FUNCS
 #undef is_TEST
@@ -429,10 +430,11 @@ is_TEST(is_echo, IsEcho);
     { \
 	return NCURSES_SP_NAME(show) (CURRENT_SCREEN); \
     }
-is_TEST(is_nl);
-is_TEST(is_raw);
-is_TEST(is_cbreak);
-is_TEST(is_echo);
+is_TEST(is_nl)
+is_TEST(is_raw)
+is_TEST(is_cbreak)
+is_TEST(is_echo)
 #endif
 
+/* *INDENT-ON* */
 #endif /* extensions */
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index 0c194b46..2b1f079e 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -148,7 +148,7 @@ AUTHOR
 
 #include 
 
-MODULE_ID("$Id: hardscroll.c,v 1.57 2023/06/25 15:39:32 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.58 2023/09/09 16:04:08 Nicholas.Marriott Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -323,7 +323,7 @@ NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0)
 				_nc_SLIMIT(want - strlen(buf))
 				" %02d", number);
 		} else {
-		    strcat(buf, " ??");
+		    _nc_STRCAT(buf, " ??", want - strlen(buf));
 		}
 	    }
 	    free(buf);
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 32c47310..9c61e9bf 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230902) unstable; urgency=low
+ncurses6 (6.4+20230909) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 02 Sep 2023 05:30:01 -0400
+ -- Thomas E. Dickey   Sat, 09 Sep 2023 08:21:39 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 32c47310..9c61e9bf 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230902) unstable; urgency=low
+ncurses6 (6.4+20230909) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 02 Sep 2023 05:30:01 -0400
+ -- Thomas E. Dickey   Sat, 09 Sep 2023 08:21:39 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 49bea141..daf3cf75 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230902) unstable; urgency=low
+ncurses6 (6.4+20230909) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 02 Sep 2023 05:30:01 -0400
+ -- Thomas E. Dickey   Sat, 09 Sep 2023 08:21:39 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f33f8ac2..05be5485 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.602 2023/09/02 09:30:01 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.603 2023/09/09 12:21:39 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0902"
+!define VERSION_MMDD  "0909"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 7cf2d1c3..e108cf6f 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.4
-Release: 20230902
+Release: 20230909
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8531bc9f..b32c8999 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230902
+Release: 20230909
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index f32819cc..e241a4d7 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230902
+Release: 20230909
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.45.0