diff -Nru nano-7.0/aclocal.m4 nano-7.2/aclocal.m4 --- nano-7.0/aclocal.m4 2022-11-15 10:40:15.000000000 +0000 +++ nano-7.2/aclocal.m4 2023-01-18 08:48:29.000000000 +0000 @@ -1456,6 +1456,7 @@ m4_include([m4/eealloc.m4]) m4_include([m4/errno_h.m4]) m4_include([m4/error.m4]) +m4_include([m4/error_h.m4]) m4_include([m4/exponentd.m4]) m4_include([m4/exponentf.m4]) m4_include([m4/exponentl.m4]) @@ -1618,5 +1619,4 @@ m4_include([m4/wmemchr.m4]) m4_include([m4/wmempcpy.m4]) m4_include([m4/xsize.m4]) -m4_include([m4/year2038.m4]) m4_include([m4/zzgnulib.m4]) diff -Nru nano-7.0/ChangeLog nano-7.2/ChangeLog --- nano-7.0/ChangeLog 2022-11-15 10:30:40.000000000 +0000 +++ nano-7.2/ChangeLog 2023-01-18 08:44:59.000000000 +0000 @@ -1,3 +1,34 @@ +Changes between v7.1 and v7.2: +------------------------------ + +Benno Schulenberg (11): + bindings: let ^/ toggle between the 'search' and 'gotoline' menus + bump version numbers and add a news item for the 7.2 release + copyright: update the years for the FSF + docs: give ^K and ^U some useful function in the alternative bindings + docs: put the binding of ^Y after its unbinding, for it to be effective + gnulib: update to its current upstream state + input: disallow bracketed pastes when in view mode + syntax: html: colorize specially the other two emphasizing tags too + tweaks: avoid warnings when compiling with -Wpedantic + tweaks: rewrap an old news item + tweaks: separate a special thanks from the preceding ones + + +Changes between v7.0 and v7.1: +------------------------------ + +Benno Schulenberg (8): + build: fix compilation when configured with --disable-comment + bump version numbers and add a news item for the 7.1 release + copyright: update the last year for significantly changed files + docs: say thanks to the Albanian translator + rcfile: report an error when an included file does not exist + text: upon Enter, eat only lefthand blanks, not any other characters + tweaks: avoid passing NULL to access() + tweaks: wrap overlong lines in the Tcl syntax, to make them manageable + + Changes between v6.4 and v7.0: ------------------------------ diff -Nru nano-7.0/config.h.in nano-7.2/config.h.in --- nano-7.0/config.h.in 2022-11-15 10:40:41.000000000 +0000 +++ nano-7.2/config.h.in 2023-01-18 08:48:54.000000000 +0000 @@ -579,6 +579,10 @@ don't. */ #undef HAVE_DECL_GETLOGIN_R +/* Define to 1 if you have the declaration of `getw', and to 0 if you don't. + */ +#undef HAVE_DECL_GETW + /* Define to 1 if you have the declaration of `isblank', and to 0 if you don't. */ #undef HAVE_DECL_ISBLANK @@ -611,6 +615,10 @@ and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME +/* Define to 1 if you have the declaration of `putw', and to 0 if you don't. + */ +#undef HAVE_DECL_PUTW + /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF @@ -665,6 +673,9 @@ /* Define to 1 if you have the `dirfd' function. */ #undef HAVE_DIRFD +/* Define to 1 if you have the `error' function. */ +#undef HAVE_ERROR + /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -1636,11 +1647,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1710,7 +1725,7 @@ /* Define to enable the declarations of ISO C 11 types and functions. */ #undef _ISOC11_SOURCE -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES /* Define to 1 on Solaris. */ @@ -1754,7 +1769,7 @@ /* Define if you want regoff_t to be at least as wide POSIX requires. */ #undef _REGEX_LARGE_OFFSETS -/* Number of bits in a timestamp, on hosts where this is settable. */ +/* Number of bits in time_t, on hosts where this is settable. */ #undef _TIME_BITS /* For standard stat data types on VMS. */ @@ -1764,7 +1779,7 @@ used. */ #undef __GETOPT_PREFIX -/* For 64-bit time_t on 32-bit mingw. */ +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ #undef __MINGW_USE_VC2005_COMPAT /* Define to 1 if the system predates C++11. */ @@ -1809,7 +1824,7 @@ && (!defined __clang_minor__ \ || (defined __apple_build_version__ \ ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))) + : 5 <= __clang_major__))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr @@ -1843,14 +1858,10 @@ # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -#ifdef __has_c_attribute -# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \ - && _GL_GNUC_PREREQ (4, 6)) -# pragma GCC diagnostic ignored "-Wpedantic" -# endif -# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) -#else -# define _GL_HAS_C_ATTRIBUTE(attr) 0 +/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ +#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) +# pragma GCC diagnostic ignored "-Wpedantic" #endif @@ -1928,7 +1939,14 @@ to use this earlier definition, since may not have been included yet. */ #ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +# if defined __cplusplus && defined __GNUC__ && !defined __clang__ +/* Work around GCC bug */ +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +# else +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC (free, 1) +# endif #endif /* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated. @@ -1939,11 +1957,15 @@ - enumeration, enumeration item, - typedef, in C++ also: namespace, class, template specialization. */ -#if _GL_HAS_C_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] -#elif _GL_HAS_ATTRIBUTE (deprecated) +#ifdef __has_c_attribute +# if __has_c_attribute (__deprecated__) +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +# endif +#endif +#if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated) # define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -#else +#endif +#ifndef _GL_ATTRIBUTE_DEPRECATED # define _GL_ATTRIBUTE_DEPRECATED #endif @@ -1977,11 +1999,15 @@ 'default' label. The compiler should not warn in this case. */ /* Applies to: Empty statement (;), inside a 'switch' statement. */ /* Always expands to something. */ -#if _GL_HAS_C_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] -#elif _GL_HAS_ATTRIBUTE (fallthrough) +#ifdef __has_c_attribute +# if __has_c_attribute (__fallthrough__) +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +# endif +#endif +#if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough) # define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -#else +#endif +#ifndef _GL_ATTRIBUTE_FALLTHROUGH # define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) #endif @@ -2042,12 +2068,15 @@ - enumeration, enumeration item, - typedef, in C++ also: class. */ -/* In C++ and C2x, this is spelled [[__maybe_unused__]]. +/* In C++ and C23, this is spelled [[__maybe_unused__]]. GCC's syntax is __attribute__ ((__unused__)). clang supports both syntaxes. */ -#if _GL_HAS_C_ATTRIBUTE (maybe_unused) -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -#else +#ifdef __has_c_attribute +# if __has_c_attribute (__maybe_unused__) +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +#endif +#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED # define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED #endif /* Alternative spelling of this macro, for convenience and for @@ -2060,11 +2089,15 @@ discard the return value. The compiler may warn if the caller does not use the return value, unless the caller uses something like ignore_value. */ /* Applies to: function, enumeration, class. */ -#if _GL_HAS_C_ATTRIBUTE (nodiscard) -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -#elif _GL_HAS_ATTRIBUTE (warn_unused_result) +#ifdef __has_c_attribute +# if __has_c_attribute (__nodiscard__) +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +#endif +#if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result) # define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -#else +#endif +#ifndef _GL_ATTRIBUTE_NODISCARD # define _GL_ATTRIBUTE_NODISCARD #endif @@ -2346,7 +2379,7 @@ /* Solaris 11.4 defines static_assert as a macro with 2 arguments. We need it also to be invocable with a single argument. */ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus - #undef static_assert + #undef/**/static_assert #define static_assert _Static_assert #endif #endif diff -Nru nano-7.0/configure nano-7.2/configure --- nano-7.0/configure 2022-11-15 10:40:20.000000000 +0000 +++ nano-7.2/configure 2023-01-18 08:48:34.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU nano 7.0. +# Generated by GNU Autoconf 2.69 for GNU nano 7.2. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='GNU nano' PACKAGE_TARNAME='nano' -PACKAGE_VERSION='7.0' -PACKAGE_STRING='GNU nano 7.0' +PACKAGE_VERSION='7.2' +PACKAGE_STRING='GNU nano 7.2' PACKAGE_BUGREPORT='nano-devel@gnu.org' PACKAGE_URL='http://www.gnu.org/software/nano/' @@ -630,6 +630,8 @@ gl_fnmatch_required=POSIX gl_getopt_required=POSIX gt_needs= +enable_year2038=no +enable_largefile=yes ac_subst_vars='gltests_LIBOBJDEPS gltests_LTLIBOBJS gltests_LIBOBJS @@ -902,6 +904,7 @@ GL_GNULIB_STPNCPY GL_GNULIB_STPCPY GL_GNULIB_RAWMEMCHR +GL_GNULIB_MEMSET_EXPLICIT GL_GNULIB_MEMRCHR GL_GNULIB_MEMPCPY GL_GNULIB_MEMMEM @@ -946,6 +949,7 @@ HAVE_STPCPY HAVE_RAWMEMCHR HAVE_DECL_MEMRCHR +HAVE_MEMSET_EXPLICIT HAVE_MEMPCPY HAVE_DECL_MEMMEM HAVE_FFSLL @@ -963,6 +967,7 @@ GL_COND_OBJ_MBRTOWC_FALSE GL_COND_OBJ_MBRTOWC_TRUE LIB_MBRTOWC +MBRTOWC_LIB LOCALE_ZH_CN LOCALE_FR_UTF8 LOCALE_JA @@ -1085,8 +1090,11 @@ NEXT_AS_FIRST_DIRECTIVE_LIMITS_H NEXT_LIMITS_H LIB_HARD_LOCALE +HARD_LOCALE_LIB LIB_SETLOCALE_NULL +SETLOCALE_NULL_LIB LIB_SCHED_YIELD +SCHED_YIELD_LIB LIBPMULTITHREAD LIBPTHREAD GL_COND_OBJ_GLOB_PATTERN_P_FALSE @@ -1120,6 +1128,7 @@ GL_COND_OBJ_GETRANDOM_FALSE GL_COND_OBJ_GETRANDOM_TRUE LIB_GETRANDOM +GETRANDOM_LIB REPLACE_GETRANDOM HAVE_GETRANDOM GL_COND_OBJ_GETOPT_FALSE @@ -1135,6 +1144,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H NEXT_GETOPT_H LIB_GETLOGIN +GETLOGIN_LIB GL_COND_OBJ_GETLOGIN_R_FALSE GL_COND_OBJ_GETLOGIN_R_TRUE GL_COND_OBJ_GETLINE_FALSE @@ -1246,7 +1256,9 @@ HAVE_DPRINTF HAVE_DECL_VSNPRINTF HAVE_DECL_SNPRINTF +HAVE_DECL_PUTW HAVE_DECL_OBSTACK_PRINTF +HAVE_DECL_GETW HAVE_DECL_GETLINE HAVE_DECL_GETDELIM HAVE_DECL_FTELLO @@ -1627,8 +1639,15 @@ HAVE_FCNTL GL_COND_OBJ_FCHDIR_FALSE GL_COND_OBJ_FCHDIR_TRUE +GL_GENERATE_ERROR_H_FALSE +GL_GENERATE_ERROR_H_TRUE +ERROR_H GL_COND_OBJ_ERROR_FALSE GL_COND_OBJ_ERROR_TRUE +REPLACE_ERROR_AT_LINE +REPLACE_ERROR +HAVE_ERROR_AT_LINE +HAVE_ERROR GL_GENERATE_ERRNO_H_FALSE GL_GENERATE_ERRNO_H_TRUE ERRNO_H @@ -1679,6 +1698,7 @@ HAVE_WINSOCK2_H HAVE_MSVC_INVALID_PARAMETER_HANDLER LIB_CLOCK_GETTIME +CLOCK_TIME_LIB GL_COND_OBJ_CHDIR_LONG_FALSE GL_COND_OBJ_CHDIR_LONG_TRUE UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS @@ -2207,8 +2227,6 @@ enable_silent_rules enable_maintainer_mode enable_dependency_tracking -enable_largefile -enable_year2038 enable_threads enable_cross_guesses with_included_regex @@ -2240,6 +2258,8 @@ enable_tiny enable_utf8 enable_altrcname +enable_year2038 +enable_largefile ' ac_precious_vars='build_alias host_alias @@ -2807,7 +2827,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 GNU nano 7.0 to adapt to many kinds of systems. +\`configure' configures GNU nano 7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2878,7 +2898,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU nano 7.0:";; + short | recursive ) echo "Configuration of GNU nano 7.2:";; esac cat <<\_ACEOF @@ -2895,8 +2915,6 @@ do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build - --disable-largefile omit support for large files - --disable-year2038 omit support for timestamps past the year 2038 --enable-threads={isoc|posix|isoc+posix|windows} specify multithreading API --disable-threads build without multithread safety @@ -2927,6 +2945,8 @@ --enable-tiny Disable features for the sake of size --enable-utf8 Enable UTF-8 support --enable-altrcname Specify an alternate rcfile name (default: .nanorc) + --enable-year2038 support timestamps after 2038 + --disable-largefile omit support for large files Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3032,7 +3052,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU nano configure 7.0 +GNU nano configure 7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3746,7 +3766,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU nano $as_me 7.0, which was +It was created by GNU nano $as_me 7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4046,13 +4066,11 @@ as_fn_append ac_func_list " futimens" as_fn_append ac_func_list " getdelim" as_fn_append ac_func_list " getdtablesize" -as_fn_append ac_func_list " getlogin_r" gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" as_fn_append ac_header_list " sys/cdefs.h" as_fn_append ac_func_list " getprogname" as_fn_append ac_func_list " getexecname" -as_fn_append ac_func_list " getrandom" as_fn_append ac_header_list " sys/time.h" as_fn_append ac_func_list " gettimeofday" as_fn_append ac_header_list " glob.h" @@ -4096,8 +4114,6 @@ as_fn_append ac_header_list " sys/random.h" as_fn_append ac_header_list " sys/wait.h" as_fn_append ac_header_list " utime.h" -as_fn_append ac_func_list " futimes" -as_fn_append ac_func_list " futimesat" as_fn_append ac_func_list " utimensat" as_fn_append ac_func_list " lutimes" as_fn_append ac_func_list " wcrtomb" @@ -4765,7 +4781,7 @@ # Define the identity of the package. PACKAGE='nano' - VERSION='7.0' + VERSION='7.2' cat >>confdefs.h <<_ACEOF @@ -6985,6 +7001,8 @@ $as_echo "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + $as_echo "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + $as_echo "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h $as_echo "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h @@ -7296,106 +7314,20 @@ ;; esac - - - case "$host_os" in - mingw*) - -$as_echo "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h - - ;; - esac - -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -fi - -if test "$enable_largefile" != no; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : + if test "$enable_largefile" != no; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 +$as_echo_n "checking for $CC option to enable large file support... " >&6; } +if ${ac_cv_sys_largefile_opts+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF - if ac_fn_c_try_compile "$LINENO"; then : - break -fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_largefile_CC=' -n32'; break -fi -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi + ac_save_CC="$CC" + ac_opt_found=no + for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do + if test x"$ac_opt" != x"none needed"; then : + CC="$ac_save_CC $ac_opt" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 #include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply define LARGE_OFF_T to be 9223372036854775807, @@ -7403,8 +7335,8 @@ incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { @@ -7414,141 +7346,52 @@ } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=64; break + ac_cv_sys_largefile_opts="$ac_opt" + ac_opt_found=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; -esac -rm -rf conftest* - case $ac_cv_sys_file_offset_bits in #( - unknown) : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break + test $ac_opt_found = no || break + done + CC="$ac_save_CC" + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#undef _LARGE_FILES -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 +$as_echo "$ac_cv_sys_largefile_opts" >&6; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF -;; -esac -rm -rf conftest* ;; #( - 64) : +ac_have_largefile=yes +case $ac_cv_sys_largefile_opts in #( + "none needed") : + ;; #( + "support not detected") : + ac_have_largefile=no ;; #( + "-D_FILE_OFFSET_BITS=64") : - # Check whether --enable-year2038 was given. -if test "${enable_year2038+set}" = set; then : - enableval=$enable_year2038; -fi +$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h + ;; #( + "-D_LARGE_FILES=1") : - if test "$enable_year2038" != no; then : +$as_echo "#define _LARGE_FILES 1" >>confdefs.h + ;; #( + "-n32") : + CC="$CC -n32" ;; #( + *) : + as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; +esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5 -$as_echo_n "checking for time_t past the year 2038... " >&6; } -if ${gl_cv_type_time_t_y2038+:} false; then : + if test "$enable_year2038" != no; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable timestamps after Jan 2038" >&5 +$as_echo_n "checking for $CC option to enable timestamps after Jan 2038... " >&6; } +if ${ac_cv_sys_year2038_opts+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_type_time_t_y2038=yes -else - gl_cv_type_time_t_y2038=no + ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no + for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do + if test x"$ac_opt" != x"none needed"; then : + CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5 -$as_echo "$gl_cv_type_time_t_y2038" >&6; } - if test "$gl_cv_type_time_t_y2038" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5 -$as_echo_n "checking for 64-bit time_t with _TIME_BITS=64... " >&6; } -if ${gl_cv_type_time_t_bits_macro+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _TIME_BITS 64 - #define _FILE_OFFSET_BITS 64 #include /* Check that time_t can represent 2**32 - 1 correctly. */ @@ -7558,70 +7401,88 @@ && LARGE_TIME_T % 65537 == 0) ? 1 : -1]; +int +main () +{ + + ; + return 0; +} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_type_time_t_bits_macro=yes -else - gl_cv_type_time_t_bits_macro=no + ac_cv_sys_year2038_opts="$ac_opt" + ac_opt_found=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test $ac_opt_found = no || break + done + CPPFLAGS="$ac_save_CPPFLAGS" + test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 +$as_echo "$ac_cv_sys_year2038_opts" >&6; } +ac_have_year2038=yes +case $ac_cv_sys_year2038_opts in #( + "none needed") : + ;; #( + "support not detected") : + ac_have_year2038=no + case $enable_year2038 in #( + yes) : + # If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + if test $cross_compiling = no; then : + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then : + case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( + *'Feb 7 2106'* | *'Feb 7 17:10'*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "this system appears to support timestamps after +January 2038, but no mechanism for enabling wide +'time_t' was detected. Did you mean to build a 64-bit +binary? (e.g. 'CC=\"${CC} -m64\"'.) To proceed with +32-bit time_t, configure with '--disable-year2038'. +See \`config.log' for more details" "$LINENO" 5; } ;; #( + *) : + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5 -$as_echo "$gl_cv_type_time_t_bits_macro" >&6; } - if test "$gl_cv_type_time_t_bits_macro" = yes; then +fi ;; #( + *) : + ;; +esac ;; #( + "-D_TIME_BITS=64") : $as_echo "#define _TIME_BITS 64" >>confdefs.h + ;; #( + "-D__MINGW_USE_VC2005_COMPAT=1") : +$as_echo "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h + ;; #( + "-U_USE_32_BIT_TIME_T"*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It +will stop working after January 2038. Remove +_USE_32BIT_TIME_T from the compiler flags. +See \`config.log' for more details" "$LINENO" 5; } ;; #( + *) : + as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; +esac -$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h +fi - gl_cv_type_time_t_y2038=yes - fi - fi - if test $gl_cv_type_time_t_y2038 = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef _USE_32BIT_TIME_T - int ok; - #else - error fail - #endif -_ACEOF -if ac_fn_c_try_compile "$LINENO"; 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 $? "The 'time_t' type stops working after January 2038. - Remove _USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } -else - # If not cross-compiling and says we should check, - # and 'touch' works with a large timestamp, then evidently wider time_t - # is desired and supported, so fail and ask the builder to fix the - # problem. Otherwise, just warn the builder. - - if test "$gl_warned_about_y2038" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5 -$as_echo "$as_me: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;} - gl_warned_about_y2038=yes - fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -fi - ;; #( - *) : - ;; -esac -fi + @@ -7721,6 +7582,7 @@ # Code from module dup2: # Code from module errno: # Code from module error: + # Code from module error-h: # Code from module exitfail: # Code from module extensions: # Code from module extern-inline: @@ -7774,7 +7636,6 @@ # Code from module langinfo: # Code from module largefile: - # Code from module libc-config: # Code from module limits-h: # Code from module localcharset: @@ -10078,6 +9939,181 @@ fi + + + + ac_fn_c_check_decl "$LINENO" "error" "ac_cv_have_decl_error" "#include +" +if test "x$ac_cv_have_decl_error" = xyes; then : + +fi + + if test $ac_cv_have_decl_error = yes; then + for ac_func in error +do : + ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error" +if test "x$ac_cv_func_error" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ERROR 1 +_ACEOF + +fi +done + + else + ac_cv_func_error=no + fi + + if test $ac_cv_func_error = yes; then + HAVE_ERROR=1 + else + HAVE_ERROR=0 + fi + REPLACE_ERROR=0 + + ac_fn_c_check_decl "$LINENO" "error_at_line" "ac_cv_have_decl_error_at_line" "#include +" +if test "x$ac_cv_have_decl_error_at_line" = xyes; then : + +fi + + if test $ac_cv_have_decl_error_at_line = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +$as_echo_n "checking for error_at_line... " >&6; } +if ${ac_cv_lib_error_at_line+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +error_at_line (0, 0, "", 0, "an error occurred"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_error_at_line=yes +else + ac_cv_lib_error_at_line=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +$as_echo "$ac_cv_lib_error_at_line" >&6; } + else + ac_cv_lib_error_at_line=no + fi + if test $ac_cv_lib_error_at_line = yes; then + HAVE_ERROR_AT_LINE=1 + else + HAVE_ERROR_AT_LINE=0 + fi + REPLACE_ERROR_AT_LINE=0 + + if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working error function" >&5 +$as_echo_n "checking for working error function... " >&6; } +if ${gl_cv_func_working_error+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test $cross_compiling != yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + static void print_no_progname (void) {} + +int +main () +{ + + error_print_progname = print_no_progname; + error (0, 0, "foo"); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + rm -f conftest.out + if test -s conftest$ac_exeext \ + && ./conftest$ac_exeext 2> conftest.out; then + if grep ' ' conftest.out >/dev/null; then + gl_cv_func_working_error=no + else + gl_cv_func_working_error=yes + fi + else + gl_cv_func_working_error=no + fi + rm -f conftest.out + +else + gl_cv_func_working_error=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + error (0, 0, "foo"); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_error="guessing yes" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_working_error="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_error="$gl_cross_guess_normal" ;; + esac + +else + gl_cv_func_working_error=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_error" >&5 +$as_echo "$gl_cv_func_working_error" >&6; } + case "$gl_cv_func_working_error" in + *no) + REPLACE_ERROR=1 + REPLACE_ERROR_AT_LINE=1 + ;; + esac + fi + + if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ + || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then + GL_GENERATE_ERROR_H=true + else + GL_GENERATE_ERROR_H=false + fi + + + + + + ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" if test "x$ac_cv_have_decl_strerror_r" = xyes; then : ac_have_decl=1 @@ -11985,7 +12021,9 @@ HAVE_DECL_FTELLO=1; HAVE_DECL_GETDELIM=1; HAVE_DECL_GETLINE=1; + HAVE_DECL_GETW=1; HAVE_DECL_OBSTACK_PRINTF=1; + HAVE_DECL_PUTW=1; HAVE_DECL_SNPRINTF=1; HAVE_DECL_VSNPRINTF=1; HAVE_DPRINTF=1; @@ -12320,8 +12358,6 @@ #define HAVE_DECL_GETLOGIN_R $ac_have_decl _ACEOF - - ac_fn_c_check_decl "$LINENO" "getlogin" "ac_cv_have_decl_getlogin" "$ac_includes_default" if test "x$ac_cv_have_decl_getlogin" = xyes; then : ac_have_decl=1 @@ -12337,11 +12373,13 @@ case $host_os in mingw*) - LIB_GETLOGIN='-ladvapi32' ;; + GETLOGIN_LIB='-ladvapi32' ;; *) - LIB_GETLOGIN= ;; + GETLOGIN_LIB= ;; esac + LIB_GETLOGIN="$GETLOGIN_LIB" + @@ -12959,8 +12997,6 @@ - - GL_GNULIB_GETRANDOM=0 @@ -12969,7 +13005,14 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timespec_get" >&5 + ac_fn_c_check_decl "$LINENO" "timespec_get" "ac_cv_have_decl_timespec_get" "#include +" +if test "x$ac_cv_have_decl_timespec_get" = xyes; then : + +fi + + if test $ac_cv_have_decl_timespec_get = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timespec_get" >&5 $as_echo_n "checking for timespec_get... " >&6; } if ${gl_cv_func_timespec_get+:} false; then : $as_echo_n "(cached) " >&6 @@ -12977,7 +13020,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - struct timespec ts; + struct timespec ts; int main () @@ -12999,6 +13042,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_timespec_get" >&5 $as_echo "$gl_cv_func_timespec_get" >&6; } + else + gl_cv_func_timespec_get=no + fi HAVE_GETTIMEOFDAY=1; @@ -13395,8 +13441,8 @@ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:13398: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:13399: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:13444: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:13445: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -13421,7 +13467,7 @@ ;; esac - echo "$as_me:13424: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:13470: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -13575,7 +13621,7 @@ fi fi - echo "$as_me:13578: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:13624: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 $as_echo_n "checking whether POSIX threads API is available... " >&6; } @@ -13601,7 +13647,7 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - LIB_SCHED_YIELD= + SCHED_YIELD_LIB= else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 @@ -13641,7 +13687,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 $as_echo "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : - LIB_SCHED_YIELD=-lrt + SCHED_YIELD_LIB=-lrt else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 $as_echo_n "checking for sched_yield in -lposix4... " >&6; } @@ -13680,7 +13726,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : - LIB_SCHED_YIELD=-lposix4 + SCHED_YIELD_LIB=-lposix4 fi fi @@ -13690,6 +13736,8 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" + gl_pthreadlib_body_done=done fi @@ -13780,7 +13828,7 @@ if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) LIB_SETLOCALE_NULL= ;; + mingw*) SETLOCALE_NULL_LIB= ;; *) @@ -13890,15 +13938,17 @@ esac case "$gl_cv_have_weak" in - *yes) LIB_SETLOCALE_NULL= ;; - *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + *yes) SETLOCALE_NULL_LIB= ;; + *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_SETLOCALE_NULL= + SETLOCALE_NULL_LIB= fi + LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB" + @@ -17024,8 +17074,8 @@ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:17027: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:17028: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:17077: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:17078: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -17050,7 +17100,7 @@ ;; esac - echo "$as_me:17053: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:17103: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -17204,7 +17254,7 @@ fi fi - echo "$as_me:17207: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:17257: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 $as_echo_n "checking whether POSIX threads API is available... " >&6; } @@ -17230,7 +17280,7 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - LIB_SCHED_YIELD= + SCHED_YIELD_LIB= else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 @@ -17270,7 +17320,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 $as_echo "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : - LIB_SCHED_YIELD=-lrt + SCHED_YIELD_LIB=-lrt else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 $as_echo_n "checking for sched_yield in -lposix4... " >&6; } @@ -17309,7 +17359,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : - LIB_SCHED_YIELD=-lposix4 + SCHED_YIELD_LIB=-lposix4 fi fi @@ -17319,6 +17369,8 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" + gl_pthreadlib_body_done=done fi @@ -17430,8 +17482,8 @@ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:17433: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:17434: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:17485: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:17486: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -17456,7 +17508,7 @@ ;; esac - echo "$as_me:17459: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:17511: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -17610,7 +17662,7 @@ fi fi - echo "$as_me:17613: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:17665: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 $as_echo_n "checking whether POSIX threads API is available... " >&6; } @@ -17636,7 +17688,7 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - LIB_SCHED_YIELD= + SCHED_YIELD_LIB= else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 @@ -17676,7 +17728,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 $as_echo "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : - LIB_SCHED_YIELD=-lrt + SCHED_YIELD_LIB=-lrt else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 $as_echo_n "checking for sched_yield in -lposix4... " >&6; } @@ -17715,7 +17767,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : - LIB_SCHED_YIELD=-lposix4 + SCHED_YIELD_LIB=-lposix4 fi fi @@ -17725,6 +17777,8 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" + gl_pthreadlib_body_done=done fi @@ -17792,7 +17846,7 @@ fi else - LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD" + LIBSTDTHREAD="$LIBPMULTITHREAD $SCHED_YIELD_LIB" fi ;; esac @@ -18684,6 +18738,7 @@ HAVE_FFSLL=1; HAVE_DECL_MEMMEM=1; HAVE_MEMPCPY=1; + HAVE_MEMSET_EXPLICIT=1; HAVE_DECL_MEMRCHR=1; HAVE_RAWMEMCHR=1; HAVE_STPCPY=1; @@ -18868,6 +18923,10 @@ + GL_GNULIB_MEMSET_EXPLICIT=0 + + + GL_GNULIB_RAWMEMCHR=0 @@ -21331,6 +21390,28 @@ #define HAVE_DECL_FCLOSEALL $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "getw" "ac_cv_have_decl_getw" "$ac_includes_default" +if test "x$ac_cv_have_decl_getw" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETW $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "putw" "ac_cv_have_decl_putw" "$ac_includes_default" +if test "x$ac_cv_have_decl_putw" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PUTW $ac_have_decl +_ACEOF + @@ -21466,6 +21547,16 @@ HAVE_DECL_FCLOSEALL=0 fi + + if test $ac_cv_have_decl_getw = no; then + HAVE_DECL_GETW=0 + fi + + + if test $ac_cv_have_decl_putw = no; then + HAVE_DECL_PUTW=0 + fi + ac_fn_c_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" if test "x$ac_cv_have_decl_ecvt" = xyes; then : ac_have_decl=1 @@ -22899,10 +22990,6 @@ - - - - ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" if test "x$ac_cv_have_decl_vsnprintf" = xyes; then : ac_have_decl=1 @@ -23260,7 +23347,7 @@ /* end confdefs.h. */ #if defined __clang__ && __STDC_VERSION__ < 202311 #pragma clang diagnostic error "-Wc2x-extensions" - #pragma clang diagnostic error "-Wc++17-extensions" + #pragma clang diagnostic error "-Wc++1z-extensions" #endif #ifdef INCLUDE_ASSERT_H #include @@ -23716,7 +23803,7 @@ # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* # programs in the package would end up linked with that potentially-shared # library, inducing unnecessary run-time overhead. - LIB_CLOCK_GETTIME= + CLOCK_TIME_LIB= gl_saved_libs=$LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 @@ -23773,7 +23860,7 @@ if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_cv_search_clock_gettime" = "none required" || - LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime + CLOCK_TIME_LIB=$ac_cv_search_clock_gettime fi for ac_func in clock_getres clock_gettime clock_settime @@ -23789,6 +23876,9 @@ done LIBS=$gl_saved_libs + # For backward compatibility. + LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB" + @@ -24409,35 +24499,10 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -$as_echo_n "checking for error_at_line... " >&6; } -if ${ac_cv_lib_error_at_line+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -error_at_line (0, 0, "", 0, "an error occurred"); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_error_at_line=yes -else - ac_cv_lib_error_at_line=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -$as_echo "$ac_cv_lib_error_at_line" >&6; } - if test "$ac_cv_lib_error_at_line" = no; then + + if test $GL_GENERATE_ERROR_H = true; then GL_COND_OBJ_ERROR_TRUE= GL_COND_OBJ_ERROR_FALSE='#' else @@ -24473,6 +24538,40 @@ + case "$GL_GENERATE_ERROR_H" in + false) ERROR_H='' ;; + true) + if test -z "$ERROR_H"; then + ERROR_H="${gl_source_base_prefix}error.h" + fi + ;; + *) echo "*** GL_GENERATE_ERROR_H is not set correctly" 1>&2; exit 1 ;; + esac + + + if $GL_GENERATE_ERROR_H; then + GL_GENERATE_ERROR_H_TRUE= + GL_GENERATE_ERROR_H_FALSE='#' +else + GL_GENERATE_ERROR_H_TRUE='#' + GL_GENERATE_ERROR_H_FALSE= +fi +: + if test -z "${GL_GENERATE_ERROR_H_TRUE}" && test -z "${GL_GENERATE_ERROR_H_FALSE}"; then + GL_GENERATE_ERROR_H_TRUE='#' + GL_GENERATE_ERROR_H_FALSE='#' + fi + + + + + + + + + + + if test $ac_cv_have_decl_fchdir = no; then HAVE_DECL_FCHDIR=0 @@ -26639,6 +26738,28 @@ fi + ac_fn_c_check_decl "$LINENO" "getlogin_r" "ac_cv_have_decl_getlogin_r" "#include +" +if test "x$ac_cv_have_decl_getlogin_r" = xyes; then : + +fi + + if test $ac_cv_have_decl_getlogin_r = yes; then + for ac_func in getlogin_r +do : + ac_fn_c_check_func "$LINENO" "getlogin_r" "ac_cv_func_getlogin_r" +if test "x$ac_cv_func_getlogin_r" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETLOGIN_R 1 +_ACEOF + +fi +done + + else + ac_cv_func_getlogin_r=no + fi + if test $ac_cv_func_getlogin_r = no; then HAVE_GETLOGIN_R=0 else @@ -26991,6 +27112,33 @@ + ac_fn_c_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "/* Additional includes are needed before on uClibc + and Mac OS X. */ + #include + #include + #include + +" +if test "x$ac_cv_have_decl_getrandom" = xyes; then : + +fi + + if test $ac_cv_have_decl_getrandom = yes; then + for ac_func in getrandom +do : + ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom" +if test "x$ac_cv_func_getrandom" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETRANDOM 1 +_ACEOF + +fi +done + + else + ac_cv_func_getrandom=no + fi + if test "$ac_cv_func_getrandom" != yes; then HAVE_GETRANDOM=0 else @@ -27082,15 +27230,17 @@ $as_echo "#define HAVE_LIB_BCRYPT 1" >>confdefs.h - LIB_GETRANDOM='-lbcrypt' + GETRANDOM_LIB='-lbcrypt' else - LIB_GETRANDOM='-ladvapi32' + GETRANDOM_LIB='-ladvapi32' fi ;; *) - LIB_GETRANDOM= ;; + GETRANDOM_LIB= ;; esac + LIB_GETRANDOM="$GETRANDOM_LIB" + if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then @@ -27485,6 +27635,29 @@ + ac_fn_c_check_decl "$LINENO" "getlogin_r" "ac_cv_have_decl_getlogin_r" "#include +" +if test "x$ac_cv_have_decl_getlogin_r" = xyes; then : + +fi + + if test $ac_cv_have_decl_getlogin_r = yes; then + for ac_func in getlogin_r +do : + ac_fn_c_check_func "$LINENO" "getlogin_r" "ac_cv_func_getlogin_r" +if test "x$ac_cv_func_getlogin_r" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETLOGIN_R 1 +_ACEOF + +fi +done + + else + ac_cv_func_getlogin_r=no + fi + + fi @@ -27561,7 +27734,9 @@ - LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" + HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB" + + LIB_HARD_LOCALE="$HARD_LOCALE_LIB" @@ -29670,7 +29845,7 @@ fi if test $REPLACE_MBSTATE_T = 1; then case "$host_os" in - mingw*) LIB_MBRTOWC= ;; + mingw*) MBRTOWC_LIB= ;; *) @@ -29780,15 +29955,17 @@ esac case "$gl_cv_have_weak" in - *yes) LIB_MBRTOWC= ;; - *) LIB_MBRTOWC="$LIBPTHREAD" ;; + *yes) MBRTOWC_LIB= ;; + *) MBRTOWC_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_MBRTOWC= + MBRTOWC_LIB= fi + LIB_MBRTOWC="$MBRTOWC_LIB" + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then @@ -31181,7 +31358,7 @@ HAVE_NL_LANGINFO=0 fi if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then - LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL" + LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB" else LIB_NL_LANGINFO= fi @@ -32821,7 +32998,7 @@ if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) LIB_SETLOCALE_NULL= ;; + mingw*) SETLOCALE_NULL_LIB= ;; *) @@ -32931,15 +33108,17 @@ esac case "$gl_cv_have_weak" in - *yes) LIB_SETLOCALE_NULL= ;; - *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + *yes) SETLOCALE_NULL_LIB= ;; + *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_SETLOCALE_NULL= + SETLOCALE_NULL_LIB= fi + LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB" + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then @@ -36826,6 +37005,52 @@ + ac_fn_c_check_decl "$LINENO" "futimes" "ac_cv_have_decl_futimes" "#include +" +if test "x$ac_cv_have_decl_futimes" = xyes; then : + +fi + + if test $ac_cv_have_decl_futimes = yes; then + for ac_func in futimes +do : + ac_fn_c_check_func "$LINENO" "futimes" "ac_cv_func_futimes" +if test "x$ac_cv_func_futimes" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FUTIMES 1 +_ACEOF + +fi +done + + else + ac_cv_func_futimes=no + fi + + + ac_fn_c_check_decl "$LINENO" "futimesat" "ac_cv_have_decl_futimesat" "#include +" +if test "x$ac_cv_have_decl_futimesat" = xyes; then : + +fi + + if test $ac_cv_have_decl_futimesat = yes; then + for ac_func in futimesat +do : + ac_fn_c_check_func "$LINENO" "futimesat" "ac_cv_func_futimesat" +if test "x$ac_cv_func_futimesat" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FUTIMESAT 1 +_ACEOF + +fi +done + + else + ac_cv_func_futimesat=no + fi + + if test $ac_cv_func_futimens = no && test $ac_cv_func_futimesat = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether futimesat handles NULL file" >&5 $as_echo_n "checking whether futimesat handles NULL file... " >&6; } @@ -38736,322 +38961,6 @@ fi -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -fi - -if test "$enable_largefile" != no; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF - if ac_fn_c_try_compile "$LINENO"; then : - break -fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_largefile_CC=' -n32'; break -fi -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=64; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; -esac -rm -rf conftest* - case $ac_cv_sys_file_offset_bits in #( - unknown) : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#undef _LARGE_FILES -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF -;; -esac -rm -rf conftest* ;; #( - 64) : - - # Check whether --enable-year2038 was given. -if test "${enable_year2038+set}" = set; then : - enableval=$enable_year2038; -fi - - if test "$enable_year2038" != no; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5 -$as_echo_n "checking for time_t past the year 2038... " >&6; } -if ${gl_cv_type_time_t_y2038+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_type_time_t_y2038=yes -else - gl_cv_type_time_t_y2038=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5 -$as_echo "$gl_cv_type_time_t_y2038" >&6; } - if test "$gl_cv_type_time_t_y2038" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5 -$as_echo_n "checking for 64-bit time_t with _TIME_BITS=64... " >&6; } -if ${gl_cv_type_time_t_bits_macro+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _TIME_BITS 64 - #define _FILE_OFFSET_BITS 64 - - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_type_time_t_bits_macro=yes -else - gl_cv_type_time_t_bits_macro=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5 -$as_echo "$gl_cv_type_time_t_bits_macro" >&6; } - if test "$gl_cv_type_time_t_bits_macro" = yes; then - -$as_echo "#define _TIME_BITS 64" >>confdefs.h - - -$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h - - gl_cv_type_time_t_y2038=yes - fi - fi - if test $gl_cv_type_time_t_y2038 = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef _USE_32BIT_TIME_T - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; 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 $? "The 'time_t' type stops working after January 2038. - Remove _USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } -else - # If not cross-compiling and says we should check, - # and 'touch' works with a large timestamp, then evidently wider time_t - # is desired and supported, so fail and ask the builder to fix the - # problem. Otherwise, just warn the builder. - - if test "$gl_warned_about_y2038" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5 -$as_echo "$as_me: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;} - gl_warned_about_y2038=yes - fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -fi - ;; #( - *) : - ;; -esac -fi @@ -42982,6 +42891,16 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +# Check whether --enable-year2038 was given. +if test "${enable_year2038+set}" = set; then : + enableval=$enable_year2038; +fi + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -43459,7 +43378,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU nano $as_me 7.0, which was +This file was extended by GNU nano $as_me 7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -43527,7 +43446,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU nano config.status 7.0 +GNU nano config.status 7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru nano-7.0/configure.ac nano-7.2/configure.ac --- nano-7.0/configure.ac 2022-11-15 10:30:40.000000000 +0000 +++ nano-7.2/configure.ac 2023-01-18 08:44:59.000000000 +0000 @@ -1,6 +1,6 @@ # Configuration for GNU nano - a small and user-friendly text editor # -# Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2011, 2013-2023 Free Software Foundation, Inc. # Copyright (C) 2014, 2017 Mike Frysinger # # GNU nano is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see https://www.gnu.org/licenses/. -AC_INIT([GNU nano], [7.0], [nano-devel@gnu.org], [nano]) +AC_INIT([GNU nano], [7.2], [nano-devel@gnu.org], [nano]) AC_CONFIG_SRCDIR([src/nano.c]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.14]) diff -Nru nano-7.0/debian/changelog nano-7.2/debian/changelog --- nano-7.0/debian/changelog 2022-11-28 11:27:24.000000000 +0000 +++ nano-7.2/debian/changelog 2023-02-27 09:24:33.000000000 +0000 @@ -1,8 +1,25 @@ -nano (7.0-2~snowfall) jammy; urgency=medium +nano (7.2-2~simonarons) jammy; urgency=medium * New upstream release. - -- Simon Arons Mon, 28 Nov 2022 11:27:24 +0000 + -- Simon Arons Mon, 27 Feb 2023 09:24:33 +0000 + +nano (7.2-1) unstable; urgency=medium + + * The "Blue checkmark" release. + * New upstream release. + * Sync debian/nanorc with upstream nanorc.sample. + * Update copyright years. + + -- Jordi Mallach Wed, 18 Jan 2023 16:31:52 +0100 + +nano (7.1-1) unstable; urgency=medium + + * The "Home Petrov, si soc jo!" release. + * New upstream release. + * Update source lintian-overrides. + + -- Jordi Mallach Wed, 14 Dec 2022 16:15:59 +0100 nano (7.0-1) unstable; urgency=medium @@ -16,8 +33,8 @@ nano (6.4-1) unstable; urgency=medium - * New upstream release. * The "Explicaciones, ¿de qué? Jajaja" release. + * New upstream release. * Update Standards-Version to 4.6.1 (no changes needed). -- Jordi Mallach Wed, 03 Aug 2022 12:35:51 +0200 @@ -103,6 +120,14 @@ -- Jordi Mallach Sun, 11 Apr 2021 23:45:05 +0200 +nano (5.4-2+deb11u2) bullseye; urgency=medium + + * The "No a l'ampliació del port" release. + * Add three additional patches from Benno Schulenberg, with two + crash fixes and one data-loss fix. + + -- Jordi Mallach Fri, 02 Dec 2022 14:06:48 +0100 + nano (5.4-2+deb11u1) bullseye; urgency=medium * The "Bueno, de verdad, hasta luego, paso" release. diff -Nru nano-7.0/debian/copyright nano-7.2/debian/copyright --- nano-7.0/debian/copyright 2022-11-28 11:27:24.000000000 +0000 +++ nano-7.2/debian/copyright 2023-02-27 09:24:33.000000000 +0000 @@ -11,15 +11,15 @@ Files: * Copyright: © 1999-2011, 2013-2016 Free Software Foundation, Inc. - © 2014-2016 The contributors to GNU nano + © 2014-2023 The contributors to GNU nano License: GPL-3+ Files: doc/*.1 doc/*.5 doc/*.texi -Copyright: © 1999-2011, 2013-2016 Free Software Foundation, Inc. +Copyright: © 1999-2011, 2013-2023 Free Software Foundation, Inc. License: GFDL-NIV+ or GPL-3+ Files: debian/* -Copyright: Jordi Mallach +Copyright: © 1999-2023 Jordi Mallach License: GPL-3+ License: GPL-3+ diff -Nru nano-7.0/debian/patches/000more-syntax-highlighting.patch nano-7.2/debian/patches/000more-syntax-highlighting.patch --- nano-7.0/debian/patches/000more-syntax-highlighting.patch 1970-01-01 00:00:00.000000000 +0000 +++ nano-7.2/debian/patches/000more-syntax-highlighting.patch 2023-02-27 09:24:33.000000000 +0000 @@ -0,0 +1,845 @@ +Index: nano-7.2/syntax/Dockerfile.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/Dockerfile.nanorc +@@ -0,0 +1,26 @@ ++## Syntax highlighting for Dockerfiles ++syntax "Dockerfile" "Dockerfile[^/]*$" "\.dockerfile$" ++ ++## Keywords ++icolor red "^(FROM|RUN|CMD|LABEL|MAINTAINER|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ARG|ONBUILD|STOPSIGNAL|HEALTHCHECK|SHELL)[[:space:]]" ++ ++## Brackets & parenthesis ++color brightgreen "(\(|\)|\[|\])" ++ ++## Double ampersand ++color brightmagenta "&&" ++ ++## Comments ++icolor cyan "^[[:space:]]*#.*$" ++ ++## Blank space at EOL ++color ,green "[[:space:]]+$" ++ ++## Strings, single-quoted ++color brightwhite "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!" ++ ++## Strings, double-quoted ++color brightwhite ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!" ++ ++## Single and double quotes ++color brightyellow "('|\")" +Index: nano-7.2/syntax/Makefile.am +=================================================================== +--- nano-7.2.orig/syntax/Makefile.am ++++ nano-7.2/syntax/Makefile.am +@@ -1,17 +1,25 @@ +-pkgdata_DATA = asm.nanorc \ ++pkgdata_DATA = Dockerfile.nanorc \ ++ apacheconf.nanorc \ ++ asm.nanorc \ + autoconf.nanorc \ + awk.nanorc \ ++ c.nanorc \ + changelog.nanorc \ + cmake.nanorc \ +- c.nanorc \ ++ conf.nanorc \ + css.nanorc \ ++ csv.nanorc \ + default.nanorc \ ++ dotenv.nanorc \ + elisp.nanorc \ + email.nanorc \ ++ etc-hosts.nanorc \ ++ git.nanorc \ + go.nanorc \ + groff.nanorc \ + guile.nanorc \ + html.nanorc \ ++ ini.nanorc \ + java.nanorc \ + javascript.nanorc \ + json.nanorc \ +@@ -28,16 +36,22 @@ pkgdata_DATA = asm.nanorc \ + perl.nanorc \ + php.nanorc \ + po.nanorc \ ++ postgresql.nanorc \ ++ properties.nanorc \ + python.nanorc \ + ruby.nanorc \ + rust.nanorc \ ++ sed.nanorc \ + sh.nanorc \ + sql.nanorc \ ++ systemd.nanorc \ + tcl.nanorc \ + tex.nanorc \ + texinfo.nanorc \ ++ vi.nanorc \ + xml.nanorc \ +- yaml.nanorc ++ yaml.nanorc \ ++ zsh.nanorc + + nobase_pkgdata_DATA = \ + extra/ada.nanorc \ +Index: nano-7.2/syntax/Makefile.in +=================================================================== +--- nano-7.2.orig/syntax/Makefile.in ++++ nano-7.2/syntax/Makefile.in +@@ -1654,20 +1654,28 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-pkgdata_DATA = asm.nanorc \ ++pkgdata_DATA = Dockerfile.nanorc \ ++ apacheconf.nanorc \ ++ asm.nanorc \ + autoconf.nanorc \ + awk.nanorc \ ++ c.nanorc \ + changelog.nanorc \ + cmake.nanorc \ +- c.nanorc \ ++ conf.nanorc \ + css.nanorc \ ++ csv.nanorc \ + default.nanorc \ ++ dotenv.nanorc \ + elisp.nanorc \ + email.nanorc \ ++ etc-hosts.nanorc \ ++ git.nanorc \ + go.nanorc \ + groff.nanorc \ + guile.nanorc \ + html.nanorc \ ++ ini.nanorc \ + java.nanorc \ + javascript.nanorc \ + json.nanorc \ +@@ -1684,16 +1692,22 @@ pkgdata_DATA = asm.nanorc \ + perl.nanorc \ + php.nanorc \ + po.nanorc \ ++ postgresql.nanorc \ ++ properties.nanorc \ + python.nanorc \ + ruby.nanorc \ + rust.nanorc \ ++ sed.nanorc \ + sh.nanorc \ + sql.nanorc \ ++ systemd.nanorc \ + tcl.nanorc \ + tex.nanorc \ + texinfo.nanorc \ ++ vi.nanorc \ + xml.nanorc \ +- yaml.nanorc ++ yaml.nanorc \ ++ zsh.nanorc + + nobase_pkgdata_DATA = \ + extra/ada.nanorc \ +Index: nano-7.2/syntax/apacheconf.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/apacheconf.nanorc +@@ -0,0 +1,48 @@ ++# Apache files ++syntax "Apacheconf" "httpd.*\.conf|mime\.types|vhosts\.d\\*|\.htaccess.*" ++ ++color white ".+" ++color brightred "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)" ++color brightred "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)" ++color brightred "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)" ++color brightred "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)" ++color brightred "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)" ++color brightred "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)" ++color brightred "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)" ++color brightred "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)" ++color brightred "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)" ++color brightred "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)" ++color brightred "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)" ++color brightred "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)" ++color brightred "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)" ++color brightred "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)" ++color brightred "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)" ++color brightred "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)" ++color brightred "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)" ++color brightred "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)" ++color brightred "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)" ++color brightred "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)" ++color brightred "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)" ++color brightred "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)" ++color brightred "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)" ++color brightred "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)" ++color brightred "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)" ++color brightred "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)" ++color brightred "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)" ++color brightred "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)" ++color brightred "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)" ++color brightred "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)" ++color brightred "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)" ++color brightred "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)" ++color brightred "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)" ++color brightred "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)" ++color brightred "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)" ++color brightred "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)" ++color brightyellow "<[^>]+>" ++color white ")" ++color brightyellow "\"(\\.|[^\"])*\"" ++color brightblack "#.*" ++ ++## Trailing spaces ++color ,green "[[:space:]]+$" +Index: nano-7.2/syntax/conf.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/conf.nanorc +@@ -0,0 +1,11 @@ ++## Here is an example for nanorc files. ++## ++syntax "Conf" "\.c[o]?nf$" ++## Possible errors and parameters ++## Strings ++icolor white ""(\\.|[^"])*"" ++## Comments ++icolor brightblue "^[[:space:]]*#.*$" ++icolor cyan "^[[:space:]]*##.*$" ++## Trailing spaces ++color ,green "[[:space:]]+$" +Index: nano-7.2/syntax/csv.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/csv.nanorc +@@ -0,0 +1,16 @@ ++# Rainbow CSV highlighting rules (12 column coverage) ++# Inspired by https://github.com/mechatroner/rainbow_csv ++syntax "CSV" "\.csv$" ++ ++color brightmagenta "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" ++color brightcyan "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" ++color brightblue "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" ++color brightyellow "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" ++color brightgreen "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" ++color brightred "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" ++color cyan "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?" ++color magenta "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?" ++color blue "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?" ++color yellow "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?" ++color green "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?" ++color red "^("([^"]*"")*[^"]*",?)|^([^,]*,?))?" +Index: nano-7.2/syntax/dotenv.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/dotenv.nanorc +@@ -0,0 +1,10 @@ ++## Syntax highlight for .env files, eg. https://symfony.com/doc/current/components/dotenv.html ++## ++## Derived from sh.nanorc ++## ++syntax "dotenv" "\.env" "\.env\..+" ++ ++color green "(\(|\)|\$|=)" ++color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" ++color cyan "(^|[[:space:]])#.*$" ++color ,green "[[:space:]]+$" +Index: nano-7.2/syntax/etc-hosts.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/etc-hosts.nanorc +@@ -0,0 +1,15 @@ ++## Make /etc/hosts nicer to read, see `man hosts 5` to see the format ++syntax "/etc/hosts" "hosts" ++ ++# IPv4 ++color yellow "^[0-9\.]+\s" ++ ++# IPv6 ++icolor green "^[0-9a-f:]+\s" ++ ++# interpunction ++color normal "[.:]" ++ ++# comments ++color brightblack "^#.*" ++ +Index: nano-7.2/syntax/git.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/git.nanorc +@@ -0,0 +1,80 @@ ++syntax "git-config" "git(config|modules)$|\.git/config$" ++ ++color brightcyan "\<(true|false)\>" ++color cyan "^[[:space:]]*[^=]*=" ++color brightmagenta "^[[:space:]]*\[.*\]$" ++color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" ++color brightblack "(^|[[:space:]])#([^{].*)?$" ++color ,green "[[:space:]]+$" ++color ,red " +" ++ ++# This code is free software; you can redistribute it and/or modify it under ++# the terms of the new BSD License. ++# ++# Copyright (c) 2010, Sebastian Staudt ++ ++# A nano configuration file to enable syntax highlighting of some Git specific ++# files with the GNU nano text editor (http://www.nano-editor.org) ++# ++syntax "git-commit" "COMMIT_EDITMSG|TAG_EDITMSG" ++ ++# Commit message ++color yellow ".*" ++ ++# Comments ++color brightblack "^#.*" ++ ++# Files changes ++color white "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*" ++color red "#[[:space:]]deleted:" ++color green "#[[:space:]]modified:" ++color brightgreen "#[[:space:]]new file:" ++color brightblue "#[[:space:]]renamed:" ++ ++# Untracked filenames ++color black "^# [^/?*:;{}\\]+\.[^/?*:;{}\\]+$" ++ ++color brightmagenta "^#[[:space:]]Changes.*[:]" ++color brightred "^#[[:space:]]Your branch and '[^']+" ++color brightblack "^#[[:space:]]Your branch and '" ++color brightwhite "^#[[:space:]]On branch [^ ]+" ++color brightblack "^#[[:space:]]On branch" ++ ++# Recolor hash symbols ++ ++# Recolor hash symbols ++color brightblack "#" ++ ++# Trailing spaces (+LINT is not ok, git uses tabs) ++color ,green "[[:space:]]+$" ++ ++ ++# This syntax format is used for interactive rebasing ++syntax "git-rebase-todo" "git-rebase-todo" ++ ++# Default ++color yellow ".*" ++ ++# Comments ++color brightblack "^#.*" ++ ++# Rebase commands ++color green "^(e|edit) [0-9a-f]{7,40}" ++color green "^# (e, edit)" ++color brightgreen "^(f|fixup) [0-9a-f]{7,40}" ++color brightgreen "^# (f, fixup)" ++color brightwhite "^(p|pick) [0-9a-f]{7,40}" ++color brightwhite "^# (p, pick)" ++color blue "^(r|reword) [0-9a-f]{7,40}" ++color blue "^# (r, reword)" ++color brightred "^(s|squash) [0-9a-f]{7,40}" ++color brightred "^# (s, squash)" ++color yellow "^(x|exec) [^ ]+ [0-9a-f]{7,40}" ++color yellow "^# (x, exec)" ++ ++# Recolor hash symbols ++color brightblack "#" ++ ++# Commit IDs ++color brightblue "[0-9a-f]{7,40}" ++ +Index: nano-7.2/syntax/ini.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/ini.nanorc +@@ -0,0 +1,11 @@ ++syntax "INI" "\.(ini|desktop|lfl|override|cfg)$" "(mimeapps\.list|pinforc|setup\.cfg)$" "weechat/.+\.conf$" ++header "^\[[A-Za-z]+\]$" ++ ++color brightcyan "\<(true|false)\>" ++color cyan "^[[:space:]]*[^=]*=" ++color brightmagenta "^[[:space:]]*\[.*\]$" ++color red "[=;]" ++color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" ++color brightblue "(^|[[:space:]])(#([^{].*)?|;.*)$" ++color ,green "[[:space:]]+$" ++color ,red " + +| + +" +Index: nano-7.2/syntax/json.nanorc +=================================================================== +--- nano-7.2.orig/syntax/json.nanorc ++++ nano-7.2/syntax/json.nanorc +@@ -1,32 +1,13 @@ +-## Syntax highlighting for JSON files. +- +-## Original author: Aapo Rantalainen +-## License: GPL version 3 or newer +- +-syntax json "\.json$" +-# No comments are permitted in JSON. ++syntax "JSON" "\.json$" ++header "^\{$" ++# You can't add a comment to JSON. + comment "" + +-# Numbers (used as value). +-color green ":[[:blank:]]*\-?(0|[1-9][0-9]*)(\.[0-9]+)?([Ee]?[-+]?[0-9]+)?" +-# Values (well, any string). +-color brightmagenta "".+"" +-# Hex numbers (used as value). +-color green ":[[:blank:]]*"#[[:xdigit:]]+"" +-# Escapes. +-color green "\\(["\/bfnrt]|u[[:xdigit:]]{4})" +-# Special words. +-color green "\<(true|false|null)\>" +- +-# Names (very unlikely to contain a quote). +-color brightblue ""[^"]+"[[:blank:]]*:" +- +-# Brackets, braces, and separators. +-color brightblue "[][]" +-color brightred "[{},:]" +- +-# Comments. +-color cyan "(^|[[:blank:]]+)(//|#).*" +- +-# Trailing whitespace. ++color brightcyan "\<[-]?[1-9][0-9]*([Ee][+-]?[0-9]+)?\>" "\<[-]?[0](\.[0-9]+)?\>" ++color cyan "\" ++color brightcyan "\<(true|false)\>" ++color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" ++color cyan "\"(\\"|[^"])*\"[[:space:]]*:" "'(\'|[^'])*'[[:space:]]*:" ++color cyan "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]" + color ,green "[[:space:]]+$" ++color ,red " + +| + +" +Index: nano-7.2/syntax/postgresql.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/postgresql.nanorc +@@ -0,0 +1,74 @@ ++## Here is an example for PostgreSQL. ++ ++syntax sql "\.sql[2345s~]?$" ++comment "-- " ++ ++# Functions. ++color white "\<[a-z_]*\(" ++ ++# Types. ++color green "\<(int2|smallint|int4|int|integer|int8|bigint|decimal|numeric|real|double precision|(small|big)?serial)\>" ++color green "\<(bit( varying)?|boolean|bytea|enum|money|tsvector|uuid)\>" ++color green "\<(char|varchar|character( varying)?|text)\>" ++color green "\<(date|interval|time(stamp)?( with time zone| without time zone)?)\>" ++color green "\<(point|line|lseg|path|box|polygon|circle)\>" ++color green "\<(cidr|inet|macaddr)\>" ++color green "\<(daterange|int4range|int8range|numrange|tsrange|tstzrange)\>" ++ ++# Structure. ++color brightyellow "\<(CASE|CLASS|DEFAULT|DO|ELSE|ELSEIF|FOR|FOREACH|FUNCTION|IF|IS NULL)\>" ++color brightyellow "\<(NEW|PRIVATE|PUBLIC|RETURN|RETURNS|SETOF|SWITCH|THEN|WHEN|WHILE)>" ++ ++# Control flow. ++color magenta "\<(EXCEPTION|NOTICE|RAISE|RETURN)\>" ++ ++# SQL keywords. ++color blue "\<(ABORT|AGGREGATE|ALTER|ANALYZE|AND|AS|AUTHORIZATION|BEGIN|CAST|CHECKPOINT|CLASS|CLOSE)\>" ++color blue "\<(CLUSTER|COLLATION|COMMENT|COMMIT|CONFIGURATION|CONSTRAINTS|CONVERSION|COPY|CREATE)\>" ++color blue "\<(DATA|DATABASE|DEALLOCATE|DECLARE|DEFAULT|DELETE|DICTIONARY|DISCARD|DO|DOMAIN|DROP)\>" ++color blue "\<(END|EVENT|EXECUTE|EXPLAIN|EXTENSION|FAMILY|FETCH|FOREIGN|FROM|FUNCTION)\>" ++color blue "\<(GRANT|GROUP|IF NOT EXISTS|IMMUTABLE|INDEX|INSERT|INTO|LABEL|LANGUAGE|LARGE|LOAD|LOCK)\>" ++color blue "\<(MAPPING FOR|MATERIALIZED|MOVE|NOTIFY|OBJECT|OPERATOR|OPTIONS|OWNED|OWNER)\>" ++color blue "\<(PARSER|PREPARED?|PRIVILEGES|REASSIGN|REFRESH|RELEASE|RESET|REVOKE|ROLE|ROLLBACK|RULE)\>" ++color blue "\<(SAVEPOINT|SCHEMA|SEARCH|SECURITY|SELECT|SEQUENCE|SERVER|SESSION|SET|SHOW|SPACE|START|SYSTEM)\>" ++color blue "\<(TABLE|TEXT|TO|TRANSACTION|TYPE|UPDATE|USER|VACUUM|VALUES|VIEW|WHERE|WITH|WRAPPER)\>" ++ ++# Strings. ++color brightyellow "<[^= ]*>" ""(\.|[^"])*"" ++ ++# Trailing whitespace. ++color ,green "[[:space:]]+$" ++ ++# Regular expressions. ++color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*" ++ ++# Shell command expansion is in `backticks` or like %x{this}. These are ++# "double-quotish" (to use a perlism). ++color brightblue "`[^`]*`" "%x\{[^}]*\}" ++ ++# Strings, double-quoted. ++color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" ++color green "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!" ++ ++# Expression substitution. These go inside double-quoted strings, ++# "like #{this}". ++color brightgreen "#\{[^}]*\}" ++ ++# Strings, single-quoted. ++color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" ++color green "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!" ++ ++# Comments. ++color red "##?[^{].*" "##?$" ++color red "--[^{].*" "--$" ++color brightblue "//.*" ++color brightblue start="/\*" end="\*/" ++ ++# PostgreSQL markings. ++color red "(--)" ++ ++# PostgreSQL default schemas. ++color brightred "(pg_catalog|public)" ++ ++# PostgreSQL PLs. ++color brightblue "(pljava|plperlu?|plpgsql|plpy|plpythonu?|plr|plruby|plsh|pltcl|plscheme)" +Index: nano-7.2/syntax/properties.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/properties.nanorc +@@ -0,0 +1,9 @@ ++syntax properties "\.properties$" ++ ++color brightblack "^[[:space:]]*[^#!]([^:= ]|\\[:= ])*[:= ]" ++color red "[:=]" ++color magenta "\\([#!=: ]|$)" ++color magenta "\\u[[:xdigit:]]{4}" ++color cyan "^[[:space:]]*[#!].*$" ++color ,green "[[:space:]]+$" ++color ,red " + +| + +" +Index: nano-7.2/syntax/python.nanorc +=================================================================== +--- nano-7.2.orig/syntax/python.nanorc ++++ nano-7.2/syntax/python.nanorc +@@ -1,44 +1,56 @@ +-## Syntax highlighting for Python. ++## Python syntax highlighting rules for Nano + +-syntax python "\.py$" +-header "^#!.*python" ++syntax "python" "\.py$" ++header "^#!.*/(env +)?python[-0-9._]*( |$)" + magic "Python script" + comment "#" + +-# Alternative linter: pylint --exit-zero + linter pyflakes + +-# Function definitions. +-color brightblue "def [0-9A-Za-z_]+" +-# Keywords. +-color brightcyan "\<(and|as|assert|async|await|break|class|continue)\>" +-color brightcyan "\<(def|del|elif|else|except|finally|for|from)\>" +-color brightcyan "\<(global|if|import|in|is|lambda|nonlocal|not|or)\>" +-color brightcyan "\<(pass|raise|return|try|while|with|yield)\>" +- +-# These two are keywords in Python 2, but functions in Python 3, +-# so only color them when they are followed by whitespace, assuming +-# that print(x) is a function invocation and print (x) is a statement. +-color brightcyan "\<(exec|print)([[:blank:]]|$)" +- +-# Special values. +-color brightmagenta "\<(False|None|True)\>" +- +-# Mono-quoted strings. +-color brightgreen "'([^'\]|\\.)*'|"([^"\]|\\.)*"|'''|"""" +-color normal "'''|"""" +-# Comments. +-color brightred "(^|[[:blank:]])#.*" +-# Triple-quoted strings. +-color brightgreen start="'''([^'),]|$)" end="(^|[^(\])'''" +-color brightgreen start=""""([^"),]|$)" end="(^|[^(\])"""" +- +-# Backslash escapes. +-color lime "\\($|[\'"abfnrtv]|[0-3]?[0-7]?[0-7]|x[[:xdigit:]]{2})" +-color lime "\\(N\{[[:alpha:]]+\}|u[[:xdigit:]]{4}|U[[:xdigit:]]{8})" ++## built-in objects ++color cyan "\<(None|self|True|False|not)\>" ++## built-in attributes ++color cyan "\<(__builtin__|__dict__|__methods__|__members__|__class__|__bases__|__import__|__name__|__doc__|__self__|__debug__)\>" ++## built-in functions ++color brightcyan "\<(abs|append|apply|buffer|callable|chr|clear|close|closed|cmp|coerce|compile|complex|conjugate|copy|count|delattr|dir|divmod|eval|execfile|exec|extend|fileno|filter|float|flush|get|getattr|globals|has_key|hasattr|hash|hex|id|index|input|insert|int|intern|isatty|isinstance|issubclass|items|keys|len|list|locals|long|map|max|min|mode|name|oct|open|ord|pop|pow|print|range|raw_input|read|readline|readlines|reduce|reload|remove|repr|reverse|round|seek|setattr|slice|softspace|sort|str|tell|truncate|tuple|type|unichr|unicode|update|values|vars|write|writelines|xrange|zip|bool)\>" ++## built-in functions that were previously keywords ++color brightblue "\<(print|exec)\>([[:space:]]|$)" ++## special method names ++color cyan "\<(__abs__|__add__|__and__|__call__|__cmp__|__coerce__|__complex__|__concat__|__contains__|__del__|__delattr__|__delitem__|__delslice__|__div__|__divmod__|__float__|__getattr__|__getitem__|__getslice__|__hash__|__hex__|__init__|__int__|__inv__|__invert__|__len__|__long__|__lshift__|__mod__|__mul__|__neg__|__nonzero__|__oct__|__or__|__pos__|__pow__|__radd__|__rand__|__rcmp__|__rdiv__|__rdivmod__|__repeat__|__repr__|__rlshift__|__rmod__|__rmul__|__ror__|__rpow__|__rrshift__|__rshift__|__rsub__|__rxor__|__setattr__|__setitem__|__setslice__|__str__|__sub__|__xor__|__bool__)\>" ++## exception classes ++color brightblue "\<(ArithmeticError|AssertionError|AttributeError|DirectoryNotFoundError|EOFError|EnvironmentError|Exception|FileNotFoundError|FloatingPointError|IOError|ImportError|IndexError|IsADirectoryError|KeyError|KeyboardInterrupt|LookupError|MemoryError|NameError|NotImplementedError|OSError|OverflowError|PermissionError|RuntimeError|StandardError|SyntaxError|SystemError|SystemExit|TypeError|UnboundLocalError|UnicodeError|ValueError|WindowsError|ZeroDivisionError)\>" ++## types ++color brightcyan "\<(NoneType|TypeType|IntType|LongType|FloatType|ComplexType|StringType|UnicodeType|BufferType|TupleType|ListType|DictType|FunctionType|LambdaType|CodeType|ClassType|UnboundMethodType|InstanceType|MethodType|BuiltinFunctionType|BuiltinMethodType|ModuleType|FileType|XRangeType|TracebackType|FrameType|SliceType|EllipsisType)\>" ++## definitions ++color brightcyan "def [a-zA-Z_0-9]+" ++## keywords ++color brightred "\<(and|as|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|map|or|pass|raise|return|try|with|while|yield)\>" ++ ++## decorators ++color brightgreen "@.*[(]" ++ ++## operators ++color brightred "[.:;,+*|=!\%@]" "<" ">" "/" "-" "&" ++ ++## parentheses ++color brightyellow "[(){}]" "\[" "\]" ++ ++## numbers ++icolor brightcyan "\b(([1-9][0-9]+)|0+)\.[0-9]+j?\b" "\b([1-9][0-9]*[Lj]?)\b" "\b0o?[0-7]*L?\b" "\b0x[1-9a-f][0-9a-f]*L?\b" "\b0b[01]+\b" ++ ++ ++## strings ++color yellow "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}" ++color yellow "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}" ++ ++## comments ++color brightblack "^#.*|[[:space:]]#.*$" + +-# Reminders. +-color brightwhite,yellow "\<(FIXME|TODO|XXX)\>" ++## block comments ++color yellow start=""""[^"]" end=""""" start="'''[^']" end="'''" + +-# Trailing whitespace. +-color ,green "[[:space:]]+$" ++## trailing spaces ++color ,brightgreen "[[:space:]]+$" ++ ++## reminders ++color brightwhite,yellow "(FIXME|TODO|XXX)" +Index: nano-7.2/syntax/sed.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/sed.nanorc +@@ -0,0 +1,9 @@ ++syntax SED "\.sed$" ++header "^#!.*bin/(env +)?sed( |$)" ++ ++color red "[|^$.*+]" ++color brightyellow "\{[0-9]+,?[0-9]*\}" ++color magenta "\\." ++color brightblack "(^|[[:space:]])#([^{].*)?$" ++color ,green "[[:space:]]+$" ++color ,red " + +| + +" +Index: nano-7.2/syntax/sh.nanorc +=================================================================== +--- nano-7.2.orig/syntax/sh.nanorc ++++ nano-7.2/syntax/sh.nanorc +@@ -1,39 +1,39 @@ +-## Syntax highlighting for Bourne shell scripts. +- ++# Bash only syntax highlighting ++# + syntax sh "(\.sh|(\.|/)(a|ba|c|da|k|mk|pdk|tc|z)sh(rc|_profile)?|/(etc/|\.)profile)$" + header "^#!.*/((env[[:blank:]]+)?((a|ba|c|da|k|mk|pdk|tc|z)?sh)|busybox[[:blank:]]+sh|openrc-run|runscript)\>" + header "-\*-.*shell-script.*-\*-" + magic "(POSIX|Bourne-Again) shell script.*text" + comment "#" + +-linter dash -n ++## Control ++color brightcyan "\<(if|else|for|function|case|esac|in|select|until|while|do|elif|then|set|\.|done|fi)\>" ++ ++## Builtins ++color cyan "\<(source|alias|bg|bind|break|builtin|cd|command|compgen|complete|continue|dirs|disown|echo|enable|eval|exec|exit|fc|fg|getopts|hash|help|history|jobs|kill|let|logout|popd|printf|pushd|pwd|return|set|shift|shopt|suspend|test|times|trap|type|ulimit|umask|unalias|wait|export|local|unset|tput)\>" ++ ++## Unix Commands ++color brightcyan "\<(7zz|aclocal|aconnect|add-apt-key|add-apt-repository|addgroup|adduser|aplay|apm|apmsleep|apropos|apt|apt-get|apt-key|aptitude|ar|arch|arecord|as|as86|autoconf|autoheader|automake|awk|basename|bash|bc|beep|bison|blkid|btrfs|bunzip2|byobu|bzcat|bzcmp|bzdiff|bzegrep|bzfgrep|bzgrep|bzip2|bzip2recover|bzless|bzmore|c\+\+|cal|cat|cc|ccache|ccze|cd-read|cdda2wav|cdparanoia|cdrdao|cdrecord|chattr|chfn|chgrp|chmod|chown|chronyc|chroot|chsh|chvt|clear|cmp|co|col|comm|cp|cpio|cpp|curl|cut|date|dc|dd|deallocvt|deluser|df|diff|diff3|dig|dir|dircolors|directomatic|dirname|dmesg|dnsdomainname|domainname|dos2unix|dpkg|dpkg-reconfigure|du|dumpkeys|echo|ed|egrep|elinks|env|expr|fail2ban-client|false|fbset|fdisk|ffmpeg|ffprobe|fgconsole|fgrep|file|find|flex|flex\+\+|fmt|free|ftp|funzip|fuser|g\+\+|gawk|gc|gcc|gdb|gdisk|getent|getkeycodes|getopt|gettext|gettextize|gimp|gimp-remote|gimptool|gmake|gocr|gpg|grep|groupadd|groups|gs|gunzip|gzexe|gzip|hddtemp|head|hexdump|hostname|hwinfo|id|igawk|install|join|jq|kbd_mode|kbdrate|kill|killall|last|lastb|lbzip2|ld|ld86|ldd|less|lex|link|ln|loadkeys|loadunimap|locate|lockfile|login|logname|lp|lpr|ls|lsattr|lshw|lsmod|lsmod.old|lsof|lynx|m4|make|man|mapscrn|mediainfo|mesg|mkdir|mkfifo|mknod|mktemp|mkvextract|mkvmerge|more|mount|msgfmt|mv|mysql|namei|nano|nasm|nawk|nc|netstat|nginx|nice|nisdomainname|nl|nm|nm86|nmap|nohup|nop|oathtool|od|openssl|openvt|parallel|passwd|patch|pcregrep|pcretest|perl|perror|pgawk|pidof|ping|pip|pip3|pr|printf|procmail|prune|ps|ps2ascii|ps2epsi|ps2frag|ps2pdf|ps2ps|psbook|psmerge|psnup|psresize|psselect|pstops|pstree|pv|pwd|rar|rbash|rclone|rcs|readlink|red|resizecons|rev|rm|rmdir|rsync|run-parts|sash|scp|sed|seq|service|setfacl|setfont|setkeycodes|setleds|setmetamode|setserial|setterm|sh|showkey|shred|size|size86|skill|sleep|slogin|smartctl|snice|sort|source-highlight|sox|split|sponge|ssed|ssh|ssh-add|ssh-agent|ssh-keygen|ssh-keyscan|stat|strings|strip|stty|su|sudo|suidperl|sum|sync|systemctl|tac|tail|tar|tee|tempfile|test|tmux|touch|tr|true|umount|uname|unicode_start|unicode_stop|uniq|unlink|unmount|unrar|unzip|updatedb|updmap|uptime|usermod|users|utmpdump|uuidgen|vdir|vmstat|w|wall|wc|wget|whatis|whereis|which|who|whoami|write|xargs|xmlstarlet|xz|yacc|yes|ypdomainname|zcat|zcmp|zdiff|zegrep|zfgrep|zforce|zfs|zgrep|zip|zless|zmore|znew|zpool|zsh)\>" + +-# Function declarations. +-color brightgreen "^[A-Za-z0-9_-]+\(\)" ++## Strings ++color brightgreen "\"(\\.|[^\"])*\"" ++color brightgreen "'(\\.|[^\'])*'" + +-# Keywords, symbols, and comparisons. +-color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>" +-color green "\<(declare|eval|exec|export|let|local)\>" +-color green "[][{}():;|`$<>!=&\]" +-color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" +- +-# Short and long options. +-color brightmagenta "[[:blank:]](-[A-Za-z]|--\<[A-Za-z-]+)\>" +- +-# Common commands. +-color brightblue "\<(awk|cat|cd|ch(grp|mod|own)|cp|cut|echo|env|grep|head|install|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|sort|tail|tar|touch|umask|unset)\>" +-color normal "[.-]tar\>" ++## Variables ++# NOTE: Keep this section below the Strings section, such that Variables are highlighted inside strings. ++color brightmagenta start="[$@%]" end="([[:alnum:]]|_)*" ++ ++color brightyellow "[][{}():;|`$<>!=&\]" ++color brightcyan "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" + + # Basic variable names (no braces). +-color brightred "\$([-@*#?$!0-9]|[[:alpha:]_][[:alnum:]_]*)" ++color brightmagenta "\$([-@*#?$!0-9]|[[:alpha:]_][[:alnum:]_]*)" + # More complicated variable names; handles braces and replacements and arrays. +-color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:blank:]]*[[:alnum:]_]+[[:blank:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" +- +-# Comments. +-color cyan "(^|[[:blank:]])#.*" ++color brightmagenta "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:blank:]]*[[:alnum:]_]+[[:blank:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" + +-# Strings. +-color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'" ++## Brackets nd redirects ++color brightyellow "[(){}[;|<>]" ++color yellow "\]" + +-# Trailing whitespace. +-color ,green "[[:space:]]+$" ++## Comments ++color brightblack "(^|[[:blank:]])#.*" +Index: nano-7.2/syntax/systemd.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/systemd.nanorc +@@ -0,0 +1,12 @@ ++syntax "Systemd" "\.(service|socket|timer)$" ++header "^\[Unit\]$" ++ ++color cyan "^(Accept|AccuracySec|After|Alias|AllowIsolate|Also|AmbientCapabilities|AssertPathExists|AssertPathIsReadWrite|Backlog|Before|BindsTo|BusName|CacheDirectory|CacheDirectoryMode|CapabilityBoundingSet|ConditionACPower|ConditionCapability|ConditionDirectoryNotEmpty|ConditionFileIsExecutable|ConditionFileNotEmpty|ConditionFirstBoot|ConditionKernelCommandLine|ConditionNeedsUpdate|ConditionPathExists|ConditionPathExistsGlob|ConditionPathIsMountPoint|ConditionPathIsReadWrite|ConditionPathIsSymbolicLink|ConditionSecurity|ConditionVirtualization|ConfigurationDirectory|Conflicts|CPUSchedulingPolicy|DefaultDependencies|DefaultInstance|Delegate|Description|DeviceAllow|DevicePolicy|DirectoryNotEmpty|Documentation|Environment|EnvironmentFile|ExecReload|ExecStart|ExecStartPost|ExecStartPre|ExecStop|FailureAction|FileDescriptorStoreMax|Group|GuessMainPID|IgnoreOnIsolate|IgnoreSIGPIPE|IOSchedulingClass|IOSchedulingPriority|IPAddressDeny|JobTimeoutAction|JobTimeoutSec|KeyringMode|KillMode|KillSignal|LazyUnmount|LimitCORE|LimitMEMLOCK|LimitNOFILE|LimitNPROC|ListenDatagram|ListenFIFO|ListenNetlink|ListenSequentialPacket|ListenSpecial|ListenStream|LoadCredential|LockPersonality|LogsDirectory|LogsDirectoryMode|MakeDirectory|MaxConnections|MemoryDenyWriteExecute|Nice|NonBlocking|NoNewPrivileges|NotifyAccess|OnActiveSec|OnBootSec|OnCalendar|OnFailure|OnFailureJobMode|OnStartupSec|OnUnitActiveSec|OnUnitInactiveSec|OOMScoreAdjust|Options|PAMName|PartOf|PassCredentials|PassPacketInfo|PassSecurity|PathChanged|PermissionsStartOnly|Persistent|PIDFile|PrivateDevices|PrivateMounts|PrivateNetwork|PrivateTmp|PrivateUsers|ProcSubset|ProtectClock|ProtectControlGroups|ProtectHome|ProtectHostname|ProtectKernelLogs|ProtectKernelModules|ProtectKernelTunables|ProtectProc|ProtectSystem|RandomizedDelaySec|ReadOnlyPaths|ReadWritePaths|ReceiveBuffer|RefuseManualStart|RefuseManualStop|RemainAfterExit|RemoveOnStop|RequiredBy|Requires|RequiresMountsFor|Requisite|Restart|RestartKillSignal|RestartPreventExitStatus|RestartSec|RestrictAddressFamilies|RestrictNamespaces|RestrictRealtime|RestrictSUIDSGID|RuntimeDirectory|RuntimeDirectoryMode|RuntimeDirectoryPreserve|SendBuffer|SendSIGHUP|SendSIGKILL|Service|Slice|SocketGroup|SocketMode|Sockets|SocketUser|StandardError|StandardInput|StandardOutput|StartLimitBurst|StartLimitInterval|StartLimitIntervalSec|StateDirectory|StopWhenUnneeded|SuccessAction|SuccessExitStatus|SupplementaryGroups|Symlinks|SyslogIdentifier|SystemCallArchitectures|SystemCallErrorNumber|SystemCallFilter|TasksMax|TimeoutSec|TimeoutStartSec|TimeoutStopSec|Timestamping|TTYPath|TTYReset|TTYVHangup|TTYVTDisallocate|Type|UnsetEnvironment|User|UtmpIdentifier|WantedBy|Wants|WatchdogSec|What|Where|WorkingDirectory|Writable)=" ++color brightgreen "^\.include\>" ++color brightred "=" ++color brightmagenta "^\[(Unit|Install|Service|Socket)\]" ++color brightyellow "\$MAINPID" ++color brightcyan "\<(true|false)\>" ++color brightblack "(^|[[:space:]])#([^{].*)?$" ++color ,green "[[:space:]]+$" ++color ,red " + +| + +" +Index: nano-7.2/syntax/vi.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/vi.nanorc +@@ -0,0 +1,10 @@ ++syntax VI "(^|/|\.)(ex|vim)rc$|\.vim" ++ ++color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" ++color cyan "\<([nvxsoilc]?(nore|un)?map|[nvlx]n|[ico]?no|[cilovx][um]|s?unm)\>" ++color cyan "\<(snor|nun|nm|set|if|endif|let|unlet)\>" ++color red "[!&=]" ++color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" ++color brightblack "(^|[[:space:]])\"[^"]*$" ++color ,green "[[:space:]]+$" ++color ,red " + +| + +" +Index: nano-7.2/syntax/yaml.nanorc +=================================================================== +--- nano-7.2.orig/syntax/yaml.nanorc ++++ nano-7.2/syntax/yaml.nanorc +@@ -1,47 +1,27 @@ +-## Syntax highlighting for YAML files. ++syntax "yaml" "\.ya?ml$" ++#comment "#" ++#header "^---" "%YAML" ++header "^%YAML |^---( |$)" + +-## Original author: Benno Schulenberg +-## License: GPL version 3 or newer ++color normal "[:,]( |$)" + +-syntax yaml "\.ya?ml$" +-header "^%YAML |^---( |$)" ++# Values ++color yellow "(:|^|\s)+\S+" + +-tabgives " " +-comment "#" ++# Keys ++color brightred "(^|\s+).*+\s*:(\s|$)" + +-# Keys: +-color lightgreen "(\w|::|[/.-])+:( |$)" +-color lightgreen "\[(\w|::|[/., -])+\]:( |$)" +- +-# Values (booleans, numbers, octal/hex): +-color lightmagenta "[:,] +(Y(es)?|No?|y(es)?|no?|[Tt]rue|[Ff]alse|[Oo](n|ff))( *[]}]|, | +#|$)" +-color lightmagenta "[:,] +[+-]?[0-9]+(\.([0-9]+)?)?( *[]}]|, | +#|$)" +-color lightmagenta " 0(o[0-7]+|x[[:xdigit:]]+)( *[]}]|, | +#|$)" +-color normal "[:,]( |$)" +-# Values (dates, strings): +-color lightmagenta " [12][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])" +-color lightmagenta "("([^"]|\\")+"|'[^']+')" +- +-# Anchors and aliases: +-color pink " [&*](\w|-)+( |$)" +- +-# Symbols: +-color bold,lagoon "^(%YAML +[1-9]\.[0-9]$|%TAG |(---|\.\.\.)( |$))" +-color bold,lagoon " [|>]([1-9]?[+-]|[+-][1-9]?)?$" +-color bold,yellow "^ *(\?|([?:] +)?-) " +-color yellow "[]{}[]" +-color normal "^ *: " +- +-# Tags: +-color mint " !!(binary|bool|float|int|map|null|omap|seq|set|str)( |,|$)" +-color mint " ![^! ][^ ]*( |$)" +- +-# Escaped characters: +-color orange "\\([0abefnrtv"/ \_NLP]|$)" +-color orange "\\(x[[:xdigit:]]{2}|u[[:xdigit:]]{4}|U[[:xdigit:]]{8})" ++# Special values ++color cyan "[:-]\s+(true|false|null)\s*$" ++color brightcyan "[:-]\s+[0-9]+\.?[0-9]*(\s*($|#))" ++color brightyellow "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) " ++ ++# Separator ++color brightwhite "^\s+-" ++color brightwhite ":(\s|\t|$)" + +-# Mistakes (control codes, trailing space): +-color ,red "[[:cntrl:]]| +$" ++# Comments ++color brightblack "(^|[[:space:]])#.*$" + +-# Comments: +-color italic,cyan "(^| )#.*" ++# Trailing whitespace ++color ,red "[[:space:]]+$" +Index: nano-7.2/syntax/zsh.nanorc +=================================================================== +--- /dev/null ++++ nano-7.2/syntax/zsh.nanorc +@@ -0,0 +1,42 @@ ++## Syntax highlighting for ZSH scripts (initially copied from sh.nanorc) ++syntax ZSH "\.zsh$" "\.?(zshenv|zprofile|zshrc|zlogin|zlogout)$" ++header "^#!.*/(env +)?zsh( |$)" ++ ++## Numbers ++color brightyellow "\b[0-9]+\b" ++ ++## Conditionals and control flow ++color green "\<(always|break|bye|case|continue|disown|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>" ++ ++color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" ++## Conditional flags ++color green "-[Ldefgruwx]\>" ++color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>" ++ ++## Bash-inherited ++color brightblue "\<((un)?alias|bindkey|builtin|cd|declare|eval|exec|export|jobs|let|popd|pushd|set|source|typeset|umask|unset)\>" ++## ZSH-specific ++color brightblue "\<(add-zsh-hook|autoload|chdir|compinit|dirs|(dis|en)able|echotc|emulate|print|prompt(init)?|(un)?setopt|zle|zmodload|zstyle|whence)\>" ++ ++## Common linux commands ++color brightmagenta "\<((g|ig)?awk|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|tar)\>" ++ ++## Coreutils commands ++color brightmagenta "\<(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|echo|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\>" ++ ++## Function definition ++icolor brightgreen "^\s+(function\s+)[0-9A-Z_]+\s+\(\)" ++ ++## Variables ++icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?" ++ ++## Strings ++color yellow ""(\\.|[^"])*"" ++color yellow "'(\\.|[^'])*'" ++ ++## Comments ++color cyan "(^|[[:space:]])#.*$" ++color brightcyan "(^|[[:space:]])##.*$" ++ ++## Trailing spaces ++color ,blue "[[:space:]]+$" diff -Nru nano-7.0/debian/patches/more_syntax_highlighting.patch nano-7.2/debian/patches/more_syntax_highlighting.patch --- nano-7.0/debian/patches/more_syntax_highlighting.patch 2022-11-28 11:27:24.000000000 +0000 +++ nano-7.2/debian/patches/more_syntax_highlighting.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,532 +0,0 @@ -Index: nano-7.0/syntax/Dockerfile.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/Dockerfile.nanorc -@@ -0,0 +1,26 @@ -+## Syntax highlighting for Dockerfiles -+syntax "Dockerfile" "Dockerfile[^/]*$" "\.dockerfile$" -+ -+## Keywords -+icolor red "^(FROM|RUN|CMD|LABEL|MAINTAINER|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ARG|ONBUILD|STOPSIGNAL|HEALTHCHECK|SHELL)[[:space:]]" -+ -+## Brackets & parenthesis -+color brightgreen "(\(|\)|\[|\])" -+ -+## Double ampersand -+color brightmagenta "&&" -+ -+## Comments -+icolor cyan "^[[:space:]]*#.*$" -+ -+## Blank space at EOL -+color ,green "[[:space:]]+$" -+ -+## Strings, single-quoted -+color brightwhite "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!" -+ -+## Strings, double-quoted -+color brightwhite ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!" -+ -+## Single and double quotes -+color brightyellow "('|\")" -Index: nano-7.0/syntax/apacheconf.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/apacheconf.nanorc -@@ -0,0 +1,44 @@ -+# Apache files -+syntax Apacheconf "httpd\.conf|mime\.types|vhosts\.d\\*|\.htaccess" -+color yellow ".+" -+color brightcyan "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)" -+color brightcyan "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)" -+color brightcyan "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)" -+color brightcyan "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)" -+color brightcyan "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)" -+color brightcyan "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)" -+color brightcyan "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)" -+color brightcyan "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)" -+color brightcyan "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)" -+color brightcyan "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)" -+color brightcyan "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)" -+color brightcyan "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)" -+color brightcyan "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)" -+color brightcyan "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)" -+color brightcyan "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)" -+color brightcyan "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)" -+color brightcyan "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)" -+color brightcyan "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)" -+color brightcyan "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)" -+color brightcyan "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)" -+color brightcyan "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)" -+color brightcyan "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)" -+color brightcyan "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)" -+color brightcyan "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)" -+color brightcyan "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)" -+color brightcyan "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)" -+color brightcyan "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)" -+color brightcyan "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)" -+color brightcyan "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)" -+color brightcyan "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)" -+color brightcyan "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)" -+color brightcyan "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)" -+color brightcyan "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)" -+color brightcyan "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)" -+color brightcyan "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)" -+color brightcyan "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)" -+color yellow "<[^>]+>" -+color brightcyan ")" -+color green "\"(\\.|[^\"])*\"" -+color white "#.*" -Index: nano-7.0/syntax/conf.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/conf.nanorc -@@ -0,0 +1,11 @@ -+## Here is an example for nanorc files. -+## -+syntax "Conf" "\.c[o]?nf$" -+## Possible errors and parameters -+## Strings -+icolor white ""(\\.|[^"])*"" -+## Comments -+icolor brightblue "^[[:space:]]*#.*$" -+icolor cyan "^[[:space:]]*##.*$" -+## Trailing spaces -+color ,green "[[:space:]]+$" -Index: nano-7.0/syntax/csv.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/csv.nanorc -@@ -0,0 +1,16 @@ -+# Rainbow CSV highlighting rules (12 column coverage) -+# Inspired by https://github.com/mechatroner/rainbow_csv -+syntax "CSV" "\.csv$" -+ -+color brightmagenta "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" -+color brightcyan "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" -+color brightblue "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" -+color brightyellow "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" -+color brightgreen "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" -+color brightred "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?([^,]*,?))?" -+color cyan "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?" -+color magenta "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?" -+color blue "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?([^,]*,)?" -+color yellow "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?([^,]*,)?" -+color green "^("([^"]*"")*[^"]*",?)("([^"]*"")*[^"]*",?)|^([^,]*,)?([^,]*,)?" -+color red "^("([^"]*"")*[^"]*",?)|^([^,]*,?))?" -Index: nano-7.0/syntax/dotenv.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/dotenv.nanorc -@@ -0,0 +1,10 @@ -+## Syntax highlight for .env files, eg. https://symfony.com/doc/current/components/dotenv.html -+## -+## Derived from sh.nanorc -+## -+syntax "dotenv" "\.env" "\.env\..+" -+ -+color green "(\(|\)|\$|=)" -+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" -+color cyan "(^|[[:space:]])#.*$" -+color ,green "[[:space:]]+$" -Index: nano-7.0/syntax/git.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/git.nanorc -@@ -0,0 +1,80 @@ -+syntax "git-config" "git(config|modules)$|\.git/config$" -+ -+color brightcyan "\<(true|false)\>" -+color cyan "^[[:space:]]*[^=]*=" -+color brightmagenta "^[[:space:]]*\[.*\]$" -+color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" -+color brightblack "(^|[[:space:]])#([^{].*)?$" -+color ,green "[[:space:]]+$" -+color ,red " +" -+ -+# This code is free software; you can redistribute it and/or modify it under -+# the terms of the new BSD License. -+# -+# Copyright (c) 2010, Sebastian Staudt -+ -+# A nano configuration file to enable syntax highlighting of some Git specific -+# files with the GNU nano text editor (http://www.nano-editor.org) -+# -+syntax "git-commit" "COMMIT_EDITMSG|TAG_EDITMSG" -+ -+# Commit message -+color yellow ".*" -+ -+# Comments -+color brightblack "^#.*" -+ -+# Files changes -+color white "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*" -+color red "#[[:space:]]deleted:" -+color green "#[[:space:]]modified:" -+color brightgreen "#[[:space:]]new file:" -+color brightblue "#[[:space:]]renamed:" -+ -+# Untracked filenames -+color black "^# [^/?*:;{}\\]+\.[^/?*:;{}\\]+$" -+ -+color brightmagenta "^#[[:space:]]Changes.*[:]" -+color brightred "^#[[:space:]]Your branch and '[^']+" -+color brightblack "^#[[:space:]]Your branch and '" -+color brightwhite "^#[[:space:]]On branch [^ ]+" -+color brightblack "^#[[:space:]]On branch" -+ -+# Recolor hash symbols -+ -+# Recolor hash symbols -+color brightblack "#" -+ -+# Trailing spaces (+LINT is not ok, git uses tabs) -+color ,green "[[:space:]]+$" -+ -+ -+# This syntax format is used for interactive rebasing -+syntax "git-rebase-todo" "git-rebase-todo" -+ -+# Default -+color yellow ".*" -+ -+# Comments -+color brightblack "^#.*" -+ -+# Rebase commands -+color green "^(e|edit) [0-9a-f]{7,40}" -+color green "^# (e, edit)" -+color brightgreen "^(f|fixup) [0-9a-f]{7,40}" -+color brightgreen "^# (f, fixup)" -+color brightwhite "^(p|pick) [0-9a-f]{7,40}" -+color brightwhite "^# (p, pick)" -+color blue "^(r|reword) [0-9a-f]{7,40}" -+color blue "^# (r, reword)" -+color brightred "^(s|squash) [0-9a-f]{7,40}" -+color brightred "^# (s, squash)" -+color yellow "^(x|exec) [^ ]+ [0-9a-f]{7,40}" -+color yellow "^# (x, exec)" -+ -+# Recolor hash symbols -+color brightblack "#" -+ -+# Commit IDs -+color brightblue "[0-9a-f]{7,40}" -+ -Index: nano-7.0/syntax/ini.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/ini.nanorc -@@ -0,0 +1,11 @@ -+syntax "INI" "\.(ini|desktop|lfl|override|cfg)$" "(mimeapps\.list|pinforc|setup\.cfg)$" "weechat/.+\.conf$" -+header "^\[[A-Za-z]+\]$" -+ -+color brightcyan "\<(true|false)\>" -+color cyan "^[[:space:]]*[^=]*=" -+color brightmagenta "^[[:space:]]*\[.*\]$" -+color red "[=;]" -+color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" -+color brightblue "(^|[[:space:]])(#([^{].*)?|;.*)$" -+color ,green "[[:space:]]+$" -+color ,red " + +| + +" -Index: nano-7.0/syntax/postgresql.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/postgresql.nanorc -@@ -0,0 +1,74 @@ -+## Here is an example for PostgreSQL. -+ -+syntax sql "\.sql[2345s~]?$" -+comment "-- " -+ -+# Functions. -+color white "\<[a-z_]*\(" -+ -+# Types. -+color green "\<(int2|smallint|int4|int|integer|int8|bigint|decimal|numeric|real|double precision|(small|big)?serial)\>" -+color green "\<(bit( varying)?|boolean|bytea|enum|money|tsvector|uuid)\>" -+color green "\<(char|varchar|character( varying)?|text)\>" -+color green "\<(date|interval|time(stamp)?( with time zone| without time zone)?)\>" -+color green "\<(point|line|lseg|path|box|polygon|circle)\>" -+color green "\<(cidr|inet|macaddr)\>" -+color green "\<(daterange|int4range|int8range|numrange|tsrange|tstzrange)\>" -+ -+# Structure. -+color brightyellow "\<(CASE|CLASS|DEFAULT|DO|ELSE|ELSEIF|FOR|FOREACH|FUNCTION|IF|IS NULL)\>" -+color brightyellow "\<(NEW|PRIVATE|PUBLIC|RETURN|RETURNS|SETOF|SWITCH|THEN|WHEN|WHILE)>" -+ -+# Control flow. -+color magenta "\<(EXCEPTION|NOTICE|RAISE|RETURN)\>" -+ -+# SQL keywords. -+color blue "\<(ABORT|AGGREGATE|ALTER|ANALYZE|AND|AS|AUTHORIZATION|BEGIN|CAST|CHECKPOINT|CLASS|CLOSE)\>" -+color blue "\<(CLUSTER|COLLATION|COMMENT|COMMIT|CONFIGURATION|CONSTRAINTS|CONVERSION|COPY|CREATE)\>" -+color blue "\<(DATA|DATABASE|DEALLOCATE|DECLARE|DEFAULT|DELETE|DICTIONARY|DISCARD|DO|DOMAIN|DROP)\>" -+color blue "\<(END|EVENT|EXECUTE|EXPLAIN|EXTENSION|FAMILY|FETCH|FOREIGN|FROM|FUNCTION)\>" -+color blue "\<(GRANT|GROUP|IF NOT EXISTS|IMMUTABLE|INDEX|INSERT|INTO|LABEL|LANGUAGE|LARGE|LOAD|LOCK)\>" -+color blue "\<(MAPPING FOR|MATERIALIZED|MOVE|NOTIFY|OBJECT|OPERATOR|OPTIONS|OWNED|OWNER)\>" -+color blue "\<(PARSER|PREPARED?|PRIVILEGES|REASSIGN|REFRESH|RELEASE|RESET|REVOKE|ROLE|ROLLBACK|RULE)\>" -+color blue "\<(SAVEPOINT|SCHEMA|SEARCH|SECURITY|SELECT|SEQUENCE|SERVER|SESSION|SET|SHOW|SPACE|START|SYSTEM)\>" -+color blue "\<(TABLE|TEXT|TO|TRANSACTION|TYPE|UPDATE|USER|VACUUM|VALUES|VIEW|WHERE|WITH|WRAPPER)\>" -+ -+# Strings. -+color brightyellow "<[^= ]*>" ""(\.|[^"])*"" -+ -+# Trailing whitespace. -+color ,green "[[:space:]]+$" -+ -+# Regular expressions. -+color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*" -+ -+# Shell command expansion is in `backticks` or like %x{this}. These are -+# "double-quotish" (to use a perlism). -+color brightblue "`[^`]*`" "%x\{[^}]*\}" -+ -+# Strings, double-quoted. -+color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" -+color green "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!" -+ -+# Expression substitution. These go inside double-quoted strings, -+# "like #{this}". -+color brightgreen "#\{[^}]*\}" -+ -+# Strings, single-quoted. -+color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" -+color green "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!" -+ -+# Comments. -+color red "##?[^{].*" "##?$" -+color red "--[^{].*" "--$" -+color brightblue "//.*" -+color brightblue start="/\*" end="\*/" -+ -+# PostgreSQL markings. -+color red "(--)" -+ -+# PostgreSQL default schemas. -+color brightred "(pg_catalog|public)" -+ -+# PostgreSQL PLs. -+color brightblue "(pljava|plperlu?|plpgsql|plpy|plpythonu?|plr|plruby|plsh|pltcl|plscheme)" -Index: nano-7.0/syntax/properties.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/properties.nanorc -@@ -0,0 +1,9 @@ -+syntax properties "\.properties$" -+ -+color brightblack "^[[:space:]]*[^#!]([^:= ]|\\[:= ])*[:= ]" -+color red "[:=]" -+color magenta "\\([#!=: ]|$)" -+color magenta "\\u[[:xdigit:]]{4}" -+color cyan "^[[:space:]]*[#!].*$" -+color ,green "[[:space:]]+$" -+color ,red " + +| + +" -Index: nano-7.0/syntax/sed.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/sed.nanorc -@@ -0,0 +1,9 @@ -+syntax SED "\.sed$" -+header "^#!.*bin/(env +)?sed( |$)" -+ -+color red "[|^$.*+]" -+color brightyellow "\{[0-9]+,?[0-9]*\}" -+color magenta "\\." -+color brightblack "(^|[[:space:]])#([^{].*)?$" -+color ,green "[[:space:]]+$" -+color ,red " + +| + +" -Index: nano-7.0/syntax/systemd.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/systemd.nanorc -@@ -0,0 +1,12 @@ -+syntax Systemd "\.(service|socket)$" -+header "^\[Unit\]$" -+ -+color cyan "^(Accept|After|Alias|AllowIsolate|Also|ANSI_COLOR|_AUDIT_LOGINUID|_AUDIT_SESSION|Backlog|Before|BindIPv6Only|BindsTo|BindToDevice|BlockIOReadBandwidth|BlockIOWeight|BlockIOWriteBandwidth|_BOOT_ID|Broadcast|BUG_REPORT_URL|BusName|Capabilities|CapabilityBoundingSet|CHASSIS|cipher|class|_CMDLINE|CODE_FILE|CODE_FUNC|CODE_LINE|_COMM|Compress|ConditionACPower|ConditionCapability|ConditionDirectoryNotEmpty|ConditionFileIsExecutable|ConditionFileNotEmpty|ConditionHost|ConditionKernelCommandLine|ConditionNull|ConditionPathExists|ConditionPathExistsGlob|ConditionPathIsDirectory|ConditionPathIsMountPoint|ConditionPathIsReadWrite|ConditionPathIsSymbolicLink|ConditionSecurity|ConditionVirtualization|Conflicts|ControlGroup|ControlGroupAttribute|ControlGroupModify|ControlGroupPersistent|controllers|Controllers|CPE_NAME|CPUAffinity|CPUSchedulingPolicy|CPUSchedulingPriority|CPUSchedulingResetOnFork|CPUShares|CrashChVT|CrashShell|__CURSOR|debug|DefaultControllers|DefaultDependencies|DefaultLimitAS|DefaultLimitCORE|DefaultLimitCPU|DefaultLimitDATA|DefaultLimitFSIZE|DefaultLimitLOCKS|DefaultLimitMEMLOCK|DefaultLimitMSGQUEUE|DefaultLimitNICE|DefaultLimitNOFILE|DefaultLimitNPROC|DefaultLimitRSS|DefaultLimitRTPRIO|DefaultLimitRTTIME|DefaultLimitSIGPENDING|DefaultLimitSTACK|DefaultStandardError|DefaultStandardOutput|Description|DeviceAllow|DeviceDeny|DirectoryMode|DirectoryNotEmpty|Documentation|DumpCore|entropy|Environment|EnvironmentFile|ERRNO|event_timeout|_EXE|ExecReload|ExecStart|ExecStartPost|ExecStartPre|ExecStop|ExecStopPost|ExecStopPre|filter|FONT|FONT_MAP|FONT_UNIMAP|ForwardToConsole|ForwardToKMsg|ForwardToSyslog|FreeBind|freq|FsckPassNo|fstab|_GID|Group|GuessMainPID|HandleHibernateKey|HandleLidSwitch|HandlePowerKey|HandleSuspendKey|hash|HibernateKeyIgnoreInhibited|HOME_URL|_HOSTNAME|ICON_NAME|ID|IdleAction|IdleActionSec|ID_LIKE|ID_MODEL|ID_MODEL_FROM_DATABASE|IgnoreOnIsolate|IgnoreOnSnapshot|IgnoreSIGPIPE|InaccessibleDirectories|InhibitDelayMaxSec|init|IOSchedulingClass|IOSchedulingPriority|IPTOS|IPTTL|JobTimeoutSec|JoinControllers|KeepAlive|KEYMAP|KEYMAP_TOGGLE|KillExcludeUsers|KillMode|KillOnlyUsers|KillSignal|KillUserProcesses|LidSwitchIgnoreInhibited|LimitAS|LimitCORE|LimitCPU|LimitDATA|LimitFSIZE|LimitLOCKS|LimitMEMLOCK|LimitMSGQUEUE|LimitNICE|LimitNOFILE|LimitNPROC|LimitRSS|LimitRTPRIO|LimitRTTIME|LimitSIGPENDING|LimitSTACK|link_priority|valueListenDatagram|ListenFIFO|ListenMessageQueue|ListenNetlink|ListenSequentialPacket|ListenSpecial|ListenStream|LogColor|LogLevel|LogLocation|LogTarget|luks|_MACHINE_ID|MakeDirectory|Mark|MaxConnections|MaxFileSec|MaxLevelConsole|MaxLevelKMsg|MaxLevelStore|MaxLevelSyslog|MaxRetentionSec|MemoryLimit|MemorySoftLimit|MESSAGE|MESSAGE_ID|MessageQueueMaxMessages|MessageQueueMessageSize|__MONOTONIC_TIMESTAMP|MountFlags|NAME|NAutoVTs|Nice|NonBlocking|NoNewPrivileges|NotifyAccess|OnActiveSec|OnBootSec|OnCalendar|OnFailure|OnFailureIsolate|OnStartupSec|OnUnitActiveSec|OnUnitInactiveSec|OOMScoreAdjust|Options|output|PAMName|PartOf|PassCredentials|PassSecurity|PathChanged|PathExists|PathExistsGlob|PathModified|PermissionsStartOnly|_PID|PIDFile|PipeSize|PowerKeyIgnoreInhibited|PRETTY_HOSTNAME|PRETTY_NAME|Priority|PRIORITY|PrivateNetwork|PrivateTmp|PropagatesReloadTo|pss|RateLimitBurst|RateLimitInterval|ReadOnlyDirectories|ReadWriteDirectories|__REALTIME_TIMESTAMP|ReceiveBuffer|RefuseManualStart|RefuseManualStop|rel|ReloadPropagatedFrom|RemainAfterExit|RequiredBy|Requires|RequiresMountsFor|RequiresOverridable|Requisite|RequisiteOverridable|ReserveVT|ResetControllers|Restart|RestartPreventExitStatus|RestartSec|RootDirectory|RootDirectoryStartOnly|RuntimeKeepFree|RuntimeMaxFileSize|RuntimeMaxUse|RuntimeWatchdogSec|samples|scale_x|scale_y|Seal|SecureBits|_SELINUX_CONTEXT|SendBuffer|SendSIGKILL|Service|ShowStatus|ShutdownWatchdogSec|size|SmackLabel|SmackLabelIPIn|SmackLabelIPOut|SocketMode|Sockets|SourcePath|_SOURCE_REALTIME_TIMESTAMP|SplitMode|StandardError|StandardInput|StandardOutput|StartLimitAction|StartLimitBurst|StartLimitInterval|static_node|StopWhenUnneeded|Storage|string_escape|none|replaceSuccessExitStatus|SupplementaryGroups|SUPPORT_URL|SuspendKeyIgnoreInhibited|SyslogFacility|SYSLOG_FACILITY|SyslogIdentifier|SYSLOG_IDENTIFIER|SyslogLevel|SyslogLevelPrefix|SYSLOG_PID|SystemCallFilter|SYSTEMD_ALIAS|_SYSTEMD_CGROUP|_SYSTEMD_OWNER_UID|SYSTEMD_READY|_SYSTEMD_SESSION|_SYSTEMD_UNIT|_SYSTEMD_USER_UNIT|SYSTEMD_WANTS|SystemKeepFree|SystemMaxFileSize|SystemMaxUse|SysVStartPriority|TCPCongestion|TCPWrapName|timeout|TimeoutSec|TimeoutStartSec|TimeoutStopSec|TimerSlackNSec|Transparent|_TRANSPORT|tries|TTYPath|TTYReset|TTYVHangup|TTYVTDisallocate|Type|_UID|UMask|Unit|User|UtmpIdentifier|VERSION|VERSION_ID|WantedBy|Wants|WatchdogSec|What|Where|WorkingDirectory)=" -+color brightblue "^\.include\>" -+color red "=" -+color brightmagenta "^\[(Unit|Install|Service|Socket)\]" -+color brightyellow "\$MAINPID" -+color brightcyan "\<(true|false)\>" -+color brightblack "(^|[[:space:]])#([^{].*)?$" -+color ,green "[[:space:]]+$" -+color ,red " + +| + +" -Index: nano-7.0/syntax/vi.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/vi.nanorc -@@ -0,0 +1,10 @@ -+syntax VI "(^|/|\.)(ex|vim)rc$|\.vim" -+ -+color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" -+color cyan "\<([nvxsoilc]?(nore|un)?map|[nvlx]n|[ico]?no|[cilovx][um]|s?unm)\>" -+color cyan "\<(snor|nun|nm|set|if|endif|let|unlet)\>" -+color red "[!&=]" -+color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" -+color brightblack "(^|[[:space:]])\"[^"]*$" -+color ,green "[[:space:]]+$" -+color ,red " + +| + +" -Index: nano-7.0/syntax/zsh.nanorc -=================================================================== ---- /dev/null -+++ nano-7.0/syntax/zsh.nanorc -@@ -0,0 +1,42 @@ -+## Syntax highlighting for ZSH scripts (initially copied from sh.nanorc) -+syntax ZSH "\.zsh$" "\.?(zshenv|zprofile|zshrc|zlogin|zlogout)$" -+header "^#!.*/(env +)?zsh( |$)" -+ -+## Numbers -+color brightyellow "\b[0-9]+\b" -+ -+## Conditionals and control flow -+color green "\<(always|break|bye|case|continue|disown|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>" -+ -+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" -+## Conditional flags -+color green "-[Ldefgruwx]\>" -+color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>" -+ -+## Bash-inherited -+color brightblue "\<((un)?alias|bindkey|builtin|cd|declare|eval|exec|export|jobs|let|popd|pushd|set|source|typeset|umask|unset)\>" -+## ZSH-specific -+color brightblue "\<(add-zsh-hook|autoload|chdir|compinit|dirs|(dis|en)able|echotc|emulate|print|prompt(init)?|(un)?setopt|zle|zmodload|zstyle|whence)\>" -+ -+## Common linux commands -+color brightmagenta "\<((g|ig)?awk|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|tar)\>" -+ -+## Coreutils commands -+color brightmagenta "\<(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|echo|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\>" -+ -+## Function definition -+icolor brightgreen "^\s+(function\s+)[0-9A-Z_]+\s+\(\)" -+ -+## Variables -+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?" -+ -+## Strings -+color yellow ""(\\.|[^"])*"" -+color yellow "'(\\.|[^'])*'" -+ -+## Comments -+color cyan "(^|[[:space:]])#.*$" -+color brightcyan "(^|[[:space:]])##.*$" -+ -+## Trailing spaces -+color ,blue "[[:space:]]+$" -Index: nano-7.0/syntax/Makefile.am -=================================================================== ---- nano-7.0.orig/syntax/Makefile.am -+++ nano-7.0/syntax/Makefile.am -@@ -1,17 +1,24 @@ --pkgdata_DATA = asm.nanorc \ -+pkgdata_DATA = Dockerfile.nanorc \ -+ apacheconf.nanorc \ -+ asm.nanorc \ - autoconf.nanorc \ - awk.nanorc \ -+ c.nanorc \ - changelog.nanorc \ - cmake.nanorc \ -- c.nanorc \ -+ conf.nanorc \ - css.nanorc \ -+ csv.nanorc \ - default.nanorc \ -+ dotenv.nanorc \ - elisp.nanorc \ - email.nanorc \ -+ git.nanorc \ - go.nanorc \ - groff.nanorc \ - guile.nanorc \ - html.nanorc \ -+ ini.nanorc \ - java.nanorc \ - javascript.nanorc \ - json.nanorc \ -@@ -28,16 +35,22 @@ pkgdata_DATA = asm.nanorc \ - perl.nanorc \ - php.nanorc \ - po.nanorc \ -+ postgresql.nanorc \ -+ properties.nanorc \ - python.nanorc \ - ruby.nanorc \ - rust.nanorc \ -+ sed.nanorc \ - sh.nanorc \ - sql.nanorc \ -+ systemd.nanorc \ - tcl.nanorc \ - tex.nanorc \ - texinfo.nanorc \ -+ vi.nanorc \ - xml.nanorc \ -- yaml.nanorc -+ yaml.nanorc \ -+ zsh.nanorc - - nobase_pkgdata_DATA = \ - extra/ada.nanorc \ -Index: nano-7.0/syntax/Makefile.in -=================================================================== ---- nano-7.0.orig/syntax/Makefile.in -+++ nano-7.0/syntax/Makefile.in -@@ -1638,20 +1638,27 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --pkgdata_DATA = asm.nanorc \ -+pkgdata_DATA = Dockerfile.nanorc \ -+ apacheconf.nanorc \ -+ asm.nanorc \ - autoconf.nanorc \ - awk.nanorc \ -+ c.nanorc \ - changelog.nanorc \ - cmake.nanorc \ -- c.nanorc \ -+ conf.nanorc \ - css.nanorc \ -+ csv.nanorc \ - default.nanorc \ -+ dotenv.nanorc \ - elisp.nanorc \ - email.nanorc \ -+ git.nanorc \ - go.nanorc \ - groff.nanorc \ - guile.nanorc \ - html.nanorc \ -+ ini.nanorc \ - java.nanorc \ - javascript.nanorc \ - json.nanorc \ -@@ -1668,16 +1675,22 @@ pkgdata_DATA = asm.nanorc \ - perl.nanorc \ - php.nanorc \ - po.nanorc \ -+ postgresql.nanorc \ -+ properties.nanorc \ - python.nanorc \ - ruby.nanorc \ - rust.nanorc \ -+ sed.nanorc \ - sh.nanorc \ - sql.nanorc \ -+ systemd.nanorc \ - tcl.nanorc \ - tex.nanorc \ - texinfo.nanorc \ -+ vi.nanorc \ - xml.nanorc \ -- yaml.nanorc -+ yaml.nanorc \ -+ zsh.nanorc - - nobase_pkgdata_DATA = \ - extra/ada.nanorc \ diff -Nru nano-7.0/debian/patches/series nano-7.2/debian/patches/series --- nano-7.0/debian/patches/series 2022-11-28 11:27:24.000000000 +0000 +++ nano-7.2/debian/patches/series 2023-02-27 09:24:33.000000000 +0000 @@ -1 +1 @@ -more_syntax_highlighting.patch +000more-syntax-highlighting.patch diff -Nru nano-7.0/debian/source/lintian-overrides nano-7.2/debian/source/lintian-overrides --- nano-7.0/debian/source/lintian-overrides 2022-11-28 11:27:24.000000000 +0000 +++ nano-7.2/debian/source/lintian-overrides 2023-02-27 09:24:33.000000000 +0000 @@ -1,7 +1,6 @@ nano source: source-is-missing [doc/faq.html] nano source: maintainer-manual-page [debian/nano-tiny.1] nano source: maintainer-manual-page [debian/nano-tiny.fr.1] -nano source: very-long-line-length-in-source-file 634 > 512 [syntax/tcl.nanorc:15] nano source: very-long-line-length-in-source-file 640 > 512 [syntax/nanorc.nanorc:10] nano source: very-long-line-length-in-source-file 664 > 512 [doc/faq.html:177] diff -Nru nano-7.0/doc/faq.html nano-7.2/doc/faq.html --- nano-7.0/doc/faq.html 2022-11-15 10:30:40.000000000 +0000 +++ nano-7.2/doc/faq.html 2023-01-18 08:44:59.000000000 +0000 @@ -92,7 +92,7 @@

1.3. Why the name change from TIP?

On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).

1.4. What is the current version of nano?

-

The current version of nano should be 7.0. Of course, you should always check the nano homepage to see what the latest and greatest version is.

+

The current version of nano should be 7.2. Of course, you should always check the nano homepage to see what the latest and greatest version is.

1.5. I want to read the man page without having to download the program!

Jeez, demanding, aren't we? Okay, look here.


diff -Nru nano-7.0/doc/Makefile.in nano-7.2/doc/Makefile.in --- nano-7.0/doc/Makefile.in 2022-11-15 10:40:24.000000000 +0000 +++ nano-7.2/doc/Makefile.in 2023-01-18 08:48:38.000000000 +0000 @@ -108,9 +108,9 @@ $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/exponentf.m4 $(top_srcdir)/m4/exponentl.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/error_h.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ + $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/filenamecat.m4 \ @@ -197,8 +197,8 @@ $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ $(top_srcdir)/m4/wmemchr.m4 $(top_srcdir)/m4/wmempcpy.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/year2038.m4 \ - $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_html_DATA_DIST) \ @@ -387,6 +387,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CURSES_LIB = @CURSES_LIB@ @@ -404,11 +405,14 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETLOGIN_LIB = @GETLOGIN_LIB@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLOB_H = @GLOB_H@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ @@ -668,6 +672,7 @@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -875,6 +880,7 @@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACOSF = @HAVE_ACOSF@ HAVE_ACOSL = @HAVE_ACOSL@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ @@ -939,6 +945,7 @@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ @@ -953,6 +960,7 @@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ @@ -989,6 +997,8 @@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPF = @HAVE_EXPF@ @@ -1085,6 +1095,7 @@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1295,6 +1306,7 @@ LTLIBTHREAD = @LTLIBTHREAD@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -1417,6 +1429,8 @@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1661,7 +1675,9 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ diff -Nru nano-7.0/doc/nano.1 nano-7.2/doc/nano.1 --- nano-7.0/doc/nano.1 2022-11-15 10:30:40.000000000 +0000 +++ nano-7.2/doc/nano.1 2023-01-18 08:44:59.000000000 +0000 @@ -1,4 +1,4 @@ -.\" Copyright (C) 1999-2011, 2013-2022 Free Software Foundation, Inc. +.\" Copyright (C) 1999-2011, 2013-2023 Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: @@ -16,7 +16,7 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.TH NANO 1 "version 7.0" "November 2022" +.TH NANO 1 "version 7.2" "January 2023" .SH NAME nano \- Nano's ANOther editor, inspired by Pico diff -Nru nano-7.0/doc/nano.1.html nano-7.2/doc/nano.1.html --- nano-7.0/doc/nano.1.html 2022-11-15 10:31:21.000000000 +0000 +++ nano-7.2/doc/nano.1.html 2023-01-18 08:46:05.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru nano-7.0/doc/nano.html nano-7.2/doc/nano.html --- nano-7.0/doc/nano.html 2022-11-15 10:31:25.000000000 +0000 +++ nano-7.2/doc/nano.html 2023-01-18 08:46:07.000000000 +0000 @@ -48,7 +48,7 @@ -

This manual documents GNU nano, version 7.0. +

This manual documents GNU nano, version 7.2.