[src/trunk]: src/external/bsd/tmux/dist Import tmux-3.2a:

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/bsd/tmux/dist Import tmux-3.2a:
From: christos <christos%NetBSD.org@localhost>
Date: Sun, 23 Jan 2022 18:57:50 +0000
details:   https://anonhg.NetBSD.org/src/rev/ba11abc896a2
branches:  trunk
changeset: 359799:ba11abc896a2
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 23 16:45:03 2022 +0000

description:
Import tmux-3.2a:

CHANGES FROM 3.2 TO 3.2a

* Add an "always" value for the "extended-keys" option; if set then tmux will
  forward extended keys to applications even if they do not request them.

* Add a "mouse" terminal feature so tmux can enable the mouse on terminals
  where it is known to be supported even if terminfo(5) says otherwise.

* Do not expand the filename given to -f so it can contain colons.

* Fixes for problems with extended keys and modifiers, scroll region,
  source-file, crosscompiling, format modifiers and other minor issues.

diffstat:

 external/bsd/tmux/dist/CHANGES           |   23 +++++-
 external/bsd/tmux/dist/cmd-list-keys.c   |    2 +-
 external/bsd/tmux/dist/cmd-source-file.c |    4 +-
 external/bsd/tmux/dist/configure         |  105 ++++++++++++++++++++----------
 external/bsd/tmux/dist/configure.ac      |   21 ++++-
 external/bsd/tmux/dist/file.c            |    6 +-
 external/bsd/tmux/dist/grid-reader.c     |   13 ++-
 external/bsd/tmux/dist/key-string.c      |   14 ++-
 external/bsd/tmux/dist/options-table.c   |    6 +-
 external/bsd/tmux/dist/osdep-sunos.c     |   14 +++-
 external/bsd/tmux/dist/tty-features.c    |   30 +++++++-
 11 files changed, 172 insertions(+), 66 deletions(-)

diffs (truncated from 594 to 300 lines):

diff -r ab60d7f538a1 -r ba11abc896a2 external/bsd/tmux/dist/CHANGES
--- a/external/bsd/tmux/dist/CHANGES    Sun Jan 23 16:25:53 2022 +0000
+++ b/external/bsd/tmux/dist/CHANGES    Sun Jan 23 16:45:03 2022 +0000
@@ -1,3 +1,16 @@
+CHANGES FROM 3.2 TO 3.2a
+
+* Add an "always" value for the "extended-keys" option; if set then tmux will
+  forward extended keys to applications even if they do not request them.
+
+* Add a "mouse" terminal feature so tmux can enable the mouse on terminals
+  where it is known to be supported even if terminfo(5) says otherwise.
+
+* Do not expand the filename given to -f so it can contain colons.
+
+* Fixes for problems with extended keys and modifiers, scroll region,
+  source-file, crosscompiling, format modifiers and other minor issues.
+
 CHANGES FROM 3.1c TO 3.2
 
 * Add a flag to disable keys to close a message.
@@ -29,7 +42,7 @@
 * Add a -S flag to new-window to make it select the existing window if one
   with the given name already exists rather than failing with an error.
 
-* Addd a format modifier to check if a window or session name exists (N/w or
+* Add a format modifier to check if a window or session name exists (N/w or
   N/s).
 
 * Add compat clock_gettime for older macOS.
@@ -61,7 +74,7 @@
   an option on all panes.
 
 * Make replacement of ##s consistent when drawing formats, whether followed by
-  [ or not. Add a flag (e) to the q: format modifier to double up #s
+  [ or not. Add a flag (e) to the q: format modifier to double up #s.
 
 * Add -N flag to display-panes to ignore keys.
 
@@ -265,7 +278,7 @@
 
 * Wait until the initial command sequence is done before sending a device
   attributes request and other bits that prompt a reply from the terminal. This
-  means that stray relies are not left on the terminal if the command has
+  means that stray replies are not left on the terminal if the command has
   attached and then immediately detached and tmux will not be around to receive
   them.
 
@@ -280,7 +293,7 @@
   window-renamed
   window-unlinked
 
-  And these now pane options:
+  And these are now pane options:
 
   pane-died
   pane-exited
@@ -355,7 +368,7 @@
 * Add a default binding for button 2 to paste.
 
 * Add -d flag to run-shell to delay before running the command and allow it to
-  run without a command so it just delays.
+  be used without a command so it just delays.
 
 * Add C-g to cancel command prompt with vi keys as well as emacs, and q in
   command mode.
diff -r ab60d7f538a1 -r ba11abc896a2 external/bsd/tmux/dist/cmd-list-keys.c
--- a/external/bsd/tmux/dist/cmd-list-keys.c    Sun Jan 23 16:25:53 2022 +0000
+++ b/external/bsd/tmux/dist/cmd-list-keys.c    Sun Jan 23 16:45:03 2022 +0000
@@ -165,7 +165,7 @@
                        cmdq_error(item, "invalid key: %s", args->argv[0]);
                        return (CMD_RETURN_ERROR);
                }
-               only &= KEYC_MASK_KEY;
+               only &= (KEYC_MASK_KEY|KEYC_MASK_MODIFIERS);
        }
 
        tablename = args_get(args, 'T');
diff -r ab60d7f538a1 -r ba11abc896a2 external/bsd/tmux/dist/cmd-source-file.c
--- a/external/bsd/tmux/dist/cmd-source-file.c  Sun Jan 23 16:25:53 2022 +0000
+++ b/external/bsd/tmux/dist/cmd-source-file.c  Sun Jan 23 16:45:03 2022 +0000
@@ -67,7 +67,9 @@
        struct cmdq_item        *new_item;
 
        if (cfg_finished) {
-               if (cdata->retval == CMD_RETURN_ERROR && c->session == NULL)
+               if (cdata->retval == CMD_RETURN_ERROR &&
+                   c != NULL &&
+                   c->session == NULL)
                        c->retval = 1;
                new_item = cmdq_get_callback(cmd_source_file_complete_cb, NULL);
                cmdq_insert_after(cdata->after, new_item);
diff -r ab60d7f538a1 -r ba11abc896a2 external/bsd/tmux/dist/configure
--- a/external/bsd/tmux/dist/configure  Sun Jan 23 16:25:53 2022 +0000
+++ b/external/bsd/tmux/dist/configure  Sun Jan 23 16:45:03 2022 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tmux 3.2.
+# Generated by GNU Autoconf 2.69 for tmux 3.2a.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='tmux'
 PACKAGE_TARNAME='tmux'
-PACKAGE_VERSION='3.2'
-PACKAGE_STRING='tmux 3.2'
+PACKAGE_VERSION='3.2a'
+PACKAGE_STRING='tmux 3.2a'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1359,7 +1359,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tmux 3.2 to adapt to many kinds of systems.
+\`configure' configures tmux 3.2a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1430,7 +1430,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tmux 3.2:";;
+     short | recursive ) echo "Configuration of tmux 3.2a:";;
    esac
   cat <<\_ACEOF
 
@@ -1563,7 +1563,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tmux configure 3.2
+tmux configure 3.2a
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1974,7 +1974,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tmux $as_me 3.2, which was
+It was created by tmux $as_me 3.2a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2840,7 +2840,7 @@
 
 # Define the identity of the package.
  PACKAGE='tmux'
- VERSION='3.2'
+ VERSION='3.2a'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3030,10 +3030,10 @@
 if test "x$enable_fuzzing" = xyes; then
        $as_echo "#define NEED_FUZZING 1" >>confdefs.h
 
-       test "x$CC" == x && CC=clang
-       test "x$FUZZING_LIBS" == x && \
+       test "x$CC" = x && CC=clang
+       test "x$FUZZING_LIBS" = x && \
                FUZZING_LIBS="-fsanitize=fuzzer"
-       test "x$SAVED_CFLAGS" == x && \
+       test "x$SAVED_CFLAGS" = x && \
                AM_CFLAGS="-g -fsanitize=fuzzer-no-link,address"
 fi
 
@@ -5419,19 +5419,6 @@
 
 fi
 
-ac_fn_c_check_func "$LINENO" "strtonum" "ac_cv_func_strtonum"
-if test "x$ac_cv_func_strtonum" = xyes; then :
-  $as_echo "#define HAVE_STRTONUM 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strtonum.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strtonum.$ac_objext"
- ;;
-esac
-
-fi
-
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
 $as_echo_n "checking for working strnlen... " >&6; }
@@ -5491,16 +5478,60 @@
 
 
 
+# Check if strtonum works.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtonum" >&5
+$as_echo_n "checking for working strtonum... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+int
+main ()
+{
+return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  $as_echo "#define HAVE_STRTONUM 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  case " $LIBOBJS " in
+  *" strtonum.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strtonum.$ac_objext"
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
 # Clang sanitizers wrap reallocarray even if it isn't available on the target
 # system. When compiled it always returns NULL and crashes the program. To
 # detect this we need a more complicated test.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working reallocarray" >&5
 $as_echo_n "checking for working reallocarray... " >&6; }
 if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  case " $LIBOBJS " in
+  *" reallocarray.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS reallocarray.$ac_objext"
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5525,7 +5556,6 @@
 esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -5534,10 +5564,14 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working recallocarray" >&5
 $as_echo_n "checking for working recallocarray... " >&6; }
 if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+  case " $LIBOBJS " in
+  *" recallocarray.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS recallocarray.$ac_objext"
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5562,7 +5596,6 @@
 esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -8207,7 +8240,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tmux $as_me 3.2, which was
+This file was extended by tmux $as_me 3.2a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
Prev by Date: [src/trunk]: src/usr.bin/make/unit-tests tests/make: rename var-class to var-...
Next by Date: [src/trunk]: src/external/bsd/tmux merge changes between tmux-3.2 and tmux-3.2a
Previous by Thread: [src/trunk]: src/usr.bin/make/unit-tests tests/make: rename var-class to var-...
Next by Thread: [src/trunk]: src/external/bsd/tmux merge changes between tmux-3.2 and tmux-3.2a
Indexes:
Home | Main Index | Thread Index | Old Index