Merge remote-tracking branch 'upstream/main' into as-bool

.github/scripts/svn-sync.sh

@@ -5,18 +5,18 @@
 # git svn clone -T trunk https://svn.r-project.org/R
 # git checkout origin/trunk -b trunk
 # git remote add github https://github.com/r-devel/r-svn
-# git checkout master
-# git fetch github master
-# git reset --hard github/master
+# git checkout main
+# git fetch github main
+# git reset --hard github/main
 set -e
 set -x
 git checkout trunk
 git svn rebase
 git push github trunk
-git checkout master
-git fetch github master
-git reset --hard github/master
-LASTMSG=$(git log master --grep="git-svn-id: https://svn.r-project.org/R/trunk" -n1 | grep -o 'git-svn-id: [^ ]*')
+git checkout main
+git fetch github main
+git reset --hard github/main
+LASTMSG=$(git log main --grep="git-svn-id: https://svn.r-project.org/R/trunk" -n1 | grep -o 'git-svn-id: [^ ]*')
 LASTSVN=$(git log trunk --grep="$LASTMSG" -n1 --pretty="%H")
 if [ -z "$LASTSVN" ]; then
  echo "FAILED TO FIND LASTSVN"
@@ -33,9 +33,9 @@ do
  GIT_COMMITTER_NAME="$(git log -1 $hash --pretty=format:%cn)" \
  GIT_COMMITTER_EMAIL="$(git log -1 $hash --pretty=format:%ce)" \
  git cherry-pick "$hash"
- git push github master
+ git push github main
 done
 
-# Check that master and trunk are identical except for .github directory
+# Check that main and trunk are identical except for .github directory
 # This verifies that we haven't omitted any commits
-git diff --stat master trunk -- . ':(exclude).github'
+git diff --stat main trunk -- . ':(exclude).github'

config.site

@@ -389,7 +389,7 @@
 ## Some claim Solaris needs -lsocket -lnsl
 ## INTERNET_LIBS=
 
-## Script from texinfo 5.1 or later.
+## Script from Texinfo 6.1 or later.
 ## Usually the full path to texi2any.
 ## TEXI2ANY=
 

configure

@@ -935,7 +935,6 @@ TEXI2DVICMD
 TEXI2DVI
 TEXI2ANY_VERSION_MIN
 TEXI2ANY_VERSION_MAJ
-HAVE_TEXI2ANY_V7_TRUE
 INSTALL_INFO
 TEXI2ANY
 MAKEINDEX
@@ -5948,35 +5947,35 @@ else case e in #(
 esac
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether texi2any version is at least 5.1" >&5
-printf %s "checking whether texi2any version is at least 5.1... " >&6; }
-if test ${r_cv_prog_texi2any_v5+y}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether texi2any version is at least 6.1" >&5
+printf %s "checking whether texi2any version is at least 6.1... " >&6; }
+if test ${r_cv_prog_texi2any_v6+y}
 then :
  printf %s "(cached) " >&6
 else case e in #(
  e) if test -z "${r_cv_prog_texi2any_version_maj}" \
  || test -z "${r_cv_prog_texi2any_version_min}"; then
- r_cv_prog_texi2any_v5=no
-elif test ${r_cv_prog_texi2any_version_maj} -gt 5; then
- r_cv_prog_texi2any_v5=yes
-elif test ${r_cv_prog_texi2any_version_maj} -lt 5 \
+ r_cv_prog_texi2any_v6=no
+elif test ${r_cv_prog_texi2any_version_maj} -gt 6; then
+ r_cv_prog_texi2any_v6=yes
+elif test ${r_cv_prog_texi2any_version_maj} -lt 6 \
  || test ${r_cv_prog_texi2any_version_min} -lt 1; then
- r_cv_prog_texi2any_v5=no
+ r_cv_prog_texi2any_v6=no
 else
- r_cv_prog_texi2any_v5=yes
+ r_cv_prog_texi2any_v6=yes
 fi ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r_cv_prog_texi2any_v5" >&5
-printf "%s\n" "$r_cv_prog_texi2any_v5" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r_cv_prog_texi2any_v6" >&5
+printf "%s\n" "$r_cv_prog_texi2any_v6" >&6; }
  ## Also record whether texi2any is at least 7 to appropriately handle
  ## HTML and EPUB output changes, see
  ## <https://lists.gnu.org/archive/html/bug-texinfo/2022-11/msg00036.html>.
 if test ${r_cv_prog_texi2any_v7+y}
 then :
  printf %s "(cached) " >&6
 else case e in #(
- e) if test ${r_cv_prog_texi2any_v5} = yes \
+ e) if test ${r_cv_prog_texi2any_v6} = yes \
  && test ${r_cv_prog_texi2any_version_maj} -ge 7; then
  r_cv_prog_texi2any_v7=yes
 else
@@ -6040,20 +6039,14 @@ test -n "$INSTALL_INFO" || INSTALL_INFO="false"
 
 
 fi
-if test "${r_cv_prog_texi2any_v5}" != yes; then
+if test "${r_cv_prog_texi2any_v6}" != yes; then
  warn_info="you cannot build info or HTML versions of the R manuals"
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ${warn_info}" >&5
 printf "%s\n" "$as_me: WARNING: ${warn_info}" >&2;}
  TEXI2ANY=""
 else
  TEXI2ANY="${TEXI2ANY}"
 fi
-if test "${r_cv_prog_texi2any_v7}" != yes; then
- HAVE_TEXI2ANY_V7_TRUE='#'
-else
- HAVE_TEXI2ANY_V7_TRUE=
-fi
-
 TEXI2ANY_VERSION_MAJ=${r_cv_prog_texi2any_version_maj}
 
 TEXI2ANY_VERSION_MIN=${r_cv_prog_texi2any_version_min}
@@ -9061,24 +9054,32 @@ if test ${r_cv_visibility_attribute+y}
 then :
  printf %s "(cached) " >&6
 else case e in #(
- e) cat > conftest.c <<EOF
+ e) r_cv_visibility_attribute=no
+case "${host_os}" in
+ darwin*)
+ r_cv_visibility_attribute=yes
+ ;;
+
+ *)
+cat > conftest.c <<EOF
 int foo __attribute__ ((visibility ("hidden"))) = 1;
 int bar __attribute__ ((visibility ("default"))) = 1;
 #ifndef __GNUC__
 # error unsupported compiler
 #endif
 EOF
-r_cv_visibility_attribute=no
-if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s 1>&5'
+ if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s 1>&5'
  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; }; then
- if grep '\.hidden.*foo' conftest.s >/dev/null; then
- r_cv_visibility_attribute=yes
- fi
-fi
+ if grep '\.hidden.*foo' conftest.s >/dev/null; then
+ r_cv_visibility_attribute=yes
+ fi
+ fi
+ ;;
+esac
 rm -f conftest.cs
  ;;
 esac
@@ -9129,7 +9130,7 @@ if test "${r_cv_prog_cc_vis}" = yes; then
  fi
 fi
 case "${CC}" in
- ## Intel compiler: note that -c99 may have been appended
+ ## Obsolete Intel compiler: note that -c99 may have been appended
  *icc*)
  C_VISIBILITY=
  ;;
@@ -9187,7 +9188,7 @@ if test "${r_cv_prog_cxx_vis}" = yes; then
  fi
 fi
 case "${CXX}" in
- ## Intel compiler
+ ## Obsolete Intel compilers
  *icc*|*icpc*)
  CXX_VISIBILITY=
  ;;
@@ -9238,7 +9239,7 @@ if test "${r_cv_prog_fc_vis}" = yes; then
  fi
 fi
 case "${FC}" in
- ## Intel compiler
+ ## Obsolete Intel compilers
  *ifc|*ifort)
  F_VISIBILITY=
  ;;
@@ -27459,7 +27460,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_verb"
-(eval echo $as_me:27462: \"$ac_link\") >&5
+(eval echo $as_me:27463: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -27537,7 +27538,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_cv_prog_c_v"
-(eval echo $as_me:27540: \"$ac_link\") >&5
+(eval echo $as_me:27541: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS

doc/AUTHORS

@@ -13,7 +13,6 @@ Kurt Hornik
 Ross Ihaka
 Tomas Kalibera
 Michael Lawrence
-Friedrich Leisch
 Uwe Ligges
 Thomas Lumley
 Martin Maechler
@@ -28,7 +27,8 @@ Simon Urbanek
 
 plus Heiner Schwarte up to October 1999, Guido Masarotto up to June 2003,
 Stefano Iacus up to July 2014, Seth Falcon up to August 2015, Duncan Murdoch
-up to September 2017, Martin Morgan up to June 2021, and Douglas Bates up to March 2024.
+up to September 2017, Martin Morgan up to June 2021, Douglas Bates up to March 2024,
+and Friedrich Leisch up to April 2024.
 
 
 Current R-core members can be contacted via email to R-project.org