R --help now mentions "-s, --no-echo" instead of "--slave" / C vari…

…able now is R_NoEcho

git-svn-id: https://svn.r-project.org/R/trunk@77228 00db46b3-68df-0310-9c12-caf00c1e9a41

doc/Makefile.in

@@ -22,7 +22,7 @@ SUBDIRS = html manual
 
 HELP2MAN = perl $(top_srcdir)/tools/help2man.pl
 
-R_EXE = $(top_builddir)/bin/R --vanilla --slave
+R_EXE = $(top_builddir)/bin/R --vanilla --no-echo
 
 all: Makefile R docs
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

doc/Makefile.win

@@ -6,7 +6,7 @@ ECHO = echo
 
 include ../src/gnuwin32/MkRules
 
-R_EXE = ../$(BINDIR)/Rterm --vanilla --slave
+R_EXE = ../$(BINDIR)/Rterm --vanilla --no-echo
 
 all: NEWS.rds html/NEWS.html NEWS NEWS.pdf \
   CHANGES.rds CHANGES html/CHANGES.html

doc/NEWS.Rd

@@ -168,6 +168,14 @@
     }
   }
 
+  \subsection{UTILITIES}{
+    \itemize{
+      \item \command{R --help} now mentions the option \command{--no-echo}
+      (renamed from \command{--slave}) and its previously undocumented
+      short form \command{-s}.
+    }
+  }
+
   \subsection{BUG FIXES}{
     \itemize{
       \item \code{formula(x)} with \code{length(x) > 1} character vectors,

doc/Rscript.1

@@ -32,7 +32,7 @@ Print information on progress
 Where 'list' is a comma-separated set
 of package names, or 'NULL'
 .PP
-and also options to R (in addition to \fB\-\-slave\fR \fB\-\-no\-restore\fR),
+and also options to R (in addition to \fB\-\-no-echo\fR \fB\-\-no\-restore\fR),
 such as
 .TP
 \fB\-\-save\fR

doc/manual/Makefile.in

@@ -180,7 +180,7 @@ version.tex: Makefile $(top_srcdir)/VERSION $(SVN_REV)
 	  v="$${v} (`sed -e 1d -e 's/^Last Changed Date: //' $(SVN_REV)`)"; \
 	  $(ECHO) "$${v}") > $@
 
-R_EXE = $(top_builddir)/bin/R --slave --vanilla
+R_EXE = $(top_builddir)/bin/R --vanilla --no-echo
 
 $(texinputs_BASE): FORCE
 	@(pkg=`basename $@ -pkg.tex`; \

doc/manual/Makefile.win

@@ -173,7 +173,7 @@ version.tex: $(top_srcdir)/VERSION $(SVN_REV)
 %-pkg.tex: FORCE
 	@$(ECHO) "collecting LaTeX docs for package \`$*' ..."
 	@$(ECHO) "tools:::.pkg2tex(\"$(top_srcdir)/library/$*\")" \
-	    | LC_ALL=C $(R_EXE) --slave --vanilla
+	    | LC_ALL=C $(R_EXE) --vanilla --no-echo
 FORCE:
 
 version.texi: Makefile.win $(top_srcdir)/VERSION $(SVN_REV)

doc/manual/R-exts.texi

@@ -1318,7 +1318,7 @@ are written to a @file{.Rout} file.  If there is a
 corresponding@footnote{The best way to generate such a file is to copy
 the @file{.Rout} from a successful run of @command{R CMD check}.  If you
 want to generate it separately, do run @R{} with options
-@option{--vanilla --slave} and with environment variable
+@option{--vanilla --no-echo} and with environment variable
 @env{LANGUAGE=en} set to get messages in English.  Be careful not to use
 output with the option @option{--timings} (and note that
 @option{--as-cran} sets it).} @file{.Rout.save} file, these two are
@@ -1403,7 +1403,9 @@ not attaching them by using @code{requireNamespace(@var{pkg}, quietly =
 TRUE)} and using @code{@var{pkg}::} to refer to objects in the
 namespace).
 
-If your data files are large and you are not using @samp{LazyData} you
+If you are not using @samp{LazyData} and either your data files are large
+or e.g., you use @file{data/foo.R} scripts to produce your data, loading
+your namespace, you 
 can speed up installation by providing a file @file{datalist} in the
 @file{data} subdirectory.  This should have one line per topic that
 @code{data()} will find, in the format @samp{foo} if @code{data(foo)}
@@ -10655,7 +10657,7 @@ display here)
 @example
 PKGB_PATH=`echo 'library(packB);
   cat(system.file("lib",  package="packB", mustWork=TRUE))' \
- | "$@{R_HOME@}/bin/R" --vanilla --slave`
+ | "$@{R_HOME@}/bin/R" --vanilla --no-echo`
 PKG_LIBS="$(PKGB_PATH)$(R_ARCH)/libpackB.a"
 @end example
 
@@ -10666,7 +10668,7 @@ a shared object, @file{.so}, on that platform) we could use
 @example
 PKGB_PATH=`echo 'library(packB);
   cat(system.file("lib", package="packB", mustWork=TRUE))' \
- | "$@{R_HOME@}/bin/R" --vanilla --slave`
+ | "$@{R_HOME@}/bin/R" --vanilla --no-echo`
 PKG_LIBS=-L"$(PKGB_PATH)$(R_ARCH)" -lpackB
 @end example
 
@@ -10688,7 +10690,7 @@ e.g.@:
 @example
 PKGB_PATH=`echo 'library(packB);
   cat(system.file("lib", package="packB", mustWork=TRUE)))' \
- | "$@{R_HOME@}/bin/R" --vanilla --slave`
+ | "$@{R_HOME@}/bin/R" --vanilla --no-echo`
 PKG_LIBS=-L"$(PKGB_PATH)$(R_ARCH)" -Wl,-rpath,"$(PKGB_PATH)$(R_ARCH)" -lpackB
 @end example
 
@@ -10739,7 +10741,7 @@ where it is by something like
 @example
 PKGB_PATH=`echo 'library(packB);
   cat(system.file("libs", package="packB", mustWork=TRUE))' \
- | rterm --vanilla --slave`
+ | rterm --vanilla --no-echo`
 PKG_LIBS= -L"$(PKGB_PATH)$(R_ARCH)" -lexB
 @end example
 

doc/manual/R-intro.texi

@@ -7165,7 +7165,7 @@ maximum allowed on that version of Windows.
 @itemx -q
 Do not print out the initial copyright and welcome messages.
 
-@item --slave
+@item --no-echo
 Make @R{} run as quietly as possible.  This option is intended to
 support programs which use @R{} to compute results for them.  It implies
 @option{--quiet} and @option{--no-save}.
@@ -7494,7 +7494,7 @@ Pinard) is to use a @emph{here document} like
 @example
 #!/bin/sh
 [environment variables can be set here]
-R --slave [other options] <<EOF
+R --no-echo [other options] <<EOF
 
    R program goes here...
 

po/Makefile.in

@@ -11,7 +11,7 @@ top_builddir = ..
 
 include $(top_builddir)/Makeconf
 
-R_EXE = $(top_builddir)/bin/R --vanilla --slave
+R_EXE = $(top_builddir)/bin/R --vanilla --no-echo
 
 LANGS = `cd $(srcdir); ls *.po | sed -e 's/\.po//' -e /^RGui/d`
 ## LANGS = da en en_GB es fr de it ja ko nn pl pt_BR ru tr zh_CN zh_TW en@quot

po/Makefile.win

@@ -9,7 +9,7 @@ R_PKGS_PO = base compiler grDevices graphics grid methods parallel splines stats
 top_srcdir = ..
 ECHO = echo
 
-R_EXE = ../bin/R --vanilla --slave
+R_EXE = ../bin/R --vanilla --no-echo
 update-RGui:
 	@echo "tools:::update_RGui_po(\"$(top_srcdir)\")" | \
 	  R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null

share/make/shlib.mk

@@ -18,4 +18,4 @@ shlib-clean:
 ## FIXME: why not Rscript?
 symbols.rds: $(OBJECTS)
 	@$(ECHO) "tools:::.shlib_objects_symbol_tables()" | \
-	  $(R_HOME)/bin/R --vanilla --slave --args $(OBJECTS)
+	  $(R_HOME)/bin/R --vanilla --no-echo --args $(OBJECTS)

share/make/winshlib.mk

@@ -30,4 +30,4 @@ shlib-clean:
 ## FIXME: why not Rscript?
 symbols.rds: $(OBJECTS)
 	@$(ECHO) "tools:::.shlib_objects_symbol_tables()" | \
-	  $(R_HOME)/bin$(R_ARCH)/Rterm.exe --vanilla --slave --args $(OBJECTS)
+	  $(R_HOME)/bin$(R_ARCH)/Rterm.exe --vanilla --no-echo --args $(OBJECTS)

src/gnuwin32/Makefile

@@ -330,7 +330,7 @@ pdfdocs manuals:
 	@$(MK) -C ../../doc/manual -f Makefile.win clean
 	@$(MK) -C ../../doc/manual -f Makefile.win
 
-R_EXE = ../../$(BINDIR)/Rterm.exe --vanilla --slave
+R_EXE = ../../$(BINDIR)/Rterm.exe --vanilla --no-echo
 
 ## must come after recommended
 vignettes:

src/gnuwin32/README.Rterm

@@ -5,7 +5,7 @@ Rterm.exe can be used in three distinct modes:
 
 1) Interactively in an MSDOS / Commands window.
 2) In batch mode by redirecting its input from a file or pipe.
-3) As a slave process for ESS mode in NTEmacs with flag --ess.
+3) As a no-echo process for ESS mode in NTEmacs with flag --ess.
 
 Its purpose is to provide something similar to the main Unix interface
 for R, including a batch capability.  The command-line arguments are

src/gnuwin32/cran/Makefile

@@ -9,7 +9,7 @@ RVER = $(shell cut -d' ' -f1 ../../../VERSION | sed -n 1p)
 DATE = $(shell date +%F)
 SIZEMB = $(shell du -m ../installer/$(RPREFIX)-win.exe | cut -f1)
 
-R_EXE = $(R_HOME)/$(BINDIR)/rterm.exe --vanilla --slave
+R_EXE = $(R_HOME)/$(BINDIR)/rterm.exe --vanilla --no-echo
 
 all:
 	$(CP) ../../../doc/html/CHANGES.html CHANGES.$(RPREFIX).html

src/gnuwin32/fixed/Makeconf

@@ -9,4 +9,4 @@ INSTALL_DATA = cp
 SHELL = sh
 USE_NLS = yes
 
-R_EXE = R_ENABLE_JIT=0 $(top_builddir)/@BINDIR@/Rterm.exe --vanilla --slave
+R_EXE = R_ENABLE_JIT=0 $(top_builddir)/@BINDIR@/Rterm.exe --vanilla --no-echo

src/gnuwin32/front-ends/rcmdfn.c

@@ -386,12 +386,12 @@ int rcmdfn (int cmdarg, int argc, char **argv)
     if (!strcmp(argv[cmdarg], "INSTALL")) {
 	/* Unix has --no-restore except for MM's undocumented --use-vanilla */
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.install_packages() R_DEFAULT_PACKAGES= LC_COLLATE=C --no-restore --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.install_packages() R_DEFAULT_PACKAGES= LC_COLLATE=C --no-restore --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "REMOVE")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"\"%s/%s/Rterm.exe\" -f \"%s/share/R/REMOVE.R\" R_DEFAULT_PACKAGES=NULL --no-restore --slave --args",
+		 "\"\"%s/%s/Rterm.exe\" -f \"%s/share/R/REMOVE.R\" R_DEFAULT_PACKAGES=NULL --no-restore --no-echo --args",
 		 getRHOME(3), BINDIR, getRHOME(3));
 	for (i = cmdarg + 1; i < argc; i++){
 	    strcat(cmd, " ");
@@ -411,17 +411,17 @@ int rcmdfn (int cmdarg, int argc, char **argv)
 	return(system(cmd));
     } else if (!strcmp(argv[cmdarg], "build")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.build_packages() R_DEFAULT_PACKAGES= LC_COLLATE=C --no-restore --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.build_packages() R_DEFAULT_PACKAGES= LC_COLLATE=C --no-restore --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "check")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.check_packages() R_DEFAULT_PACKAGES= LC_COLLATE=C --no-restore --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.check_packages() R_DEFAULT_PACKAGES= LC_COLLATE=C --no-restore --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "Rprof")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.Rprof() R_DEFAULT_PACKAGES=utils LC_COLLATE=C --vanilla --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.Rprof() R_DEFAULT_PACKAGES=utils LC_COLLATE=C --vanilla --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
    } else if (!strcmp(argv[cmdarg], "texify")) {
@@ -434,37 +434,37 @@ int rcmdfn (int cmdarg, int argc, char **argv)
 	PROCESS_CMD(" ");
     } else if (!strcmp(argv[cmdarg], "SHLIB")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.SHLIB() R_DEFAULT_PACKAGES=NULL --no-restore --slave --no-site-file --no-init-file --args",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.SHLIB() R_DEFAULT_PACKAGES=NULL --no-restore --no-echo --no-site-file --no-init-file --args",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD(" ");
     } else if (!strcmp(argv[cmdarg], "Rdiff")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.Rdiff() R_DEFAULT_PACKAGES=NULL --vanilla --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.Rdiff() R_DEFAULT_PACKAGES=NULL --vanilla --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "Rdconv")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.Rdconv() R_DEFAULT_PACKAGES= LC_COLLATE=C --vanilla --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.Rdconv() R_DEFAULT_PACKAGES= LC_COLLATE=C --vanilla --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "Rd2txt")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::.Rdconv() R_DEFAULT_PACKAGES= LC_COLLATE=C --vanilla --slave --args nextArg-tnextArgtxt",
+		 "\"%s/%s/Rterm.exe\" -e tools:::.Rdconv() R_DEFAULT_PACKAGES= LC_COLLATE=C --vanilla --no-echo --args nextArg-tnextArgtxt",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "Rd2pdf")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" -e tools:::..Rd2pdf() R_DEFAULT_PACKAGES= LC_ALL=C --vanilla --slave --args ",
+		 "\"%s/%s/Rterm.exe\" -e tools:::..Rd2pdf() R_DEFAULT_PACKAGES= LC_ALL=C --vanilla --no-echo --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "Sweave")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" --no-restore --slave -e utils:::.Sweave() --args ",
+		 "\"%s/%s/Rterm.exe\" --no-restore --no-echo -e utils:::.Sweave() --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else if (!strcmp(argv[cmdarg], "Stangle")) {
 	snprintf(cmd, CMD_LEN,
-		 "\"%s/%s/Rterm.exe\" --vanilla --slave -e utils:::.Stangle() --args ",
+		 "\"%s/%s/Rterm.exe\" --vanilla --no-echo -e utils:::.Stangle() --args ",
 		 getRHOME(3), BINDIR);
 	PROCESS_CMD("nextArg");
     } else {

src/gnuwin32/installer/Makefile

@@ -117,12 +117,12 @@ md5sums:
 	@echo "adding MD5 checksums"
 	@(cd $(RPREFIX); echo "tools:::.installMD5sums(\".\")" | \
 	  R_DEFAULT_PACKAGES=NULL LC_COLLATE=C R_OSTYPE=windows \
-	  ../../../../$(BINDIR)/Rterm.exe --vanilla --slave)
+	  ../../../../$(BINDIR)/Rterm.exe --vanilla --no-echo)
 
 PDF_FILES = $(wildcard $(RPREFIX)/library/*/doc/*.pdf)
 
 fixups:
-	echo "make.packages.html(.Library,temp=FALSE,verbose=FALSE)" | $(RPREFIX)/$(BINDIR)/Rterm.exe --vanilla --slave LC_COLLATE=C
+	echo "make.packages.html(.Library,temp=FALSE,verbose=FALSE)" | $(RPREFIX)/$(BINDIR)/Rterm.exe --vanilla --no-echo LC_COLLATE=C
 	$(CP) -pRf $(R_HOME)/Tcl $(RPREFIX)
 	$(RM) $(RPREFIX)/Tcl*/lib/*.lib
 ifneq ($(strip $(QPDF)),)
@@ -205,11 +205,11 @@ distclean: clean
 	rm -f R*-win*.exe R*-win*.msi
 
 myR:
-	echo "make.packages.html(.Library, verbose=FALSE)" | "$(IMAGEDIR)/$(BINDIR)/Rterm.exe" --vanilla --slave LC_COLLATE=C
+	echo "make.packages.html(.Library, verbose=FALSE)" | "$(IMAGEDIR)/$(BINDIR)/Rterm.exe" --vanilla --no-echo LC_COLLATE=C
 	@echo "adding MD5 checksums"
 	@(cd "$(IMAGEDIR)"; echo "tools:::.installMD5sums(\".\")" | \
 	  R_DEFAULT_PACKAGES=NULL LC_COLLATE=C R_OSTYPE=windows \
-	  "$(IMAGEDIR)/$(BINDIR)/Rterm.exe" --vanilla --slave)
+	  "$(IMAGEDIR)/$(BINDIR)/Rterm.exe" --vanilla --no-echo)
 	../../../bin$(R_ARCH)/Rscript JRins.R \
 	  $(RPREFIX) "$(IMAGEDIR)" $(MDISDI) \
 	  $(HelpStyle) $(Producer) "$(ISDIR)"

src/gnuwin32/system.c

@@ -320,7 +320,7 @@ FileReadConsole(const char *prompt, char *buf, int len, int addhistory)
 {
     int ll, err = 0;
 
-    if (!R_Slave) {
+    if (!R_NoEcho) {
 	fputs(prompt, stdout);
 	fflush(stdout);
     }
@@ -351,7 +351,7 @@ FileReadConsole(const char *prompt, char *buf, int len, int addhistory)
 	buf[ll++] = '\n'; buf[ll] = '\0';
     }
 
-    if (!R_Interactive && !R_Slave) {
+    if (!R_Interactive && !R_NoEcho) {
 	fputs(buf, stdout);
 	fflush(stdout);
     }
@@ -827,7 +827,7 @@ char *PrintUsage(void)
 	msg2b[] =
 	"  --max-mem-size=N      Set limit for memory to be used by R\n  --max-ppsize=N        Set max size of protect stack to N\n",
 	msg3[] =
-	"  -q, --quiet           Don't print startup message\n  --silent              Same as --quiet\n  --slave               Make R run as quietly as possible\n  --verbose             Print more information about progress\n  --args                Skip the rest of the command line\n",
+	"  -q, --quiet           Don't print startup message\n  --silent              Same as --quiet\n  --no-echo               Make R run as quietly as possible\n  --verbose             Print more information about progress\n  --args                Skip the rest of the command line\n",
 	msg4[] =
 	"  --ess                 Don't use getline for command-line editing\n                          and assert interactive use\n  -f file               Take input from 'file'\n  --file=file           ditto\n  -e expression         Use 'expression' as input\n\nOne or more -e options can be used, but not together with -f or --file\n",
 	msg5[] = "\nAn argument ending in .RData (in any case) is taken as the path\nto the workspace to be restored (and implies --restore)";

src/include/Defn.h

@@ -730,7 +730,7 @@ extern0 struct RPRSTACK *R_PendingPromises INI_as(NULL); /* Pending promise stac
 /* File Input/Output */
 LibExtern Rboolean R_Interactive INI_as(TRUE);	/* TRUE during interactive use*/
 extern0 Rboolean R_Quiet	INI_as(FALSE);	/* Be as quiet as possible */
-extern Rboolean  R_Slave	INI_as(FALSE);	/* Run as a slave process */
+extern Rboolean  R_NoEcho	INI_as(FALSE);	/* do not echo R code */
 extern0 Rboolean R_Verbose	INI_as(FALSE);	/* Be verbose */
 /* extern int	R_Console; */	    /* Console active flag */
 /* IoBuffer R_ConsoleIob; : --> ./IOStuff.h */

src/include/R_ext/RStartup.h

@@ -67,7 +67,7 @@ typedef enum {
 typedef struct
 {
     Rboolean R_Quiet;
-    Rboolean R_Slave;
+    Rboolean R_NoEcho;
     Rboolean R_Interactive;
     Rboolean R_Verbose;
     Rboolean LoadSiteFile;

src/include/Rinterface.h

@@ -53,7 +53,7 @@ extern "C" {
 /* this duplication will be removed in due course */
 
 extern Rboolean R_Interactive;	/* TRUE during interactive use*/
-extern Rboolean	R_Slave;	/* Run as a slave process */
+extern Rboolean	R_NoEcho;	/* do not echo R code */
 
 extern void R_RestoreGlobalEnv(void);
 extern void R_RestoreGlobalEnvFromFile(const char *, Rboolean);

src/library/Makefile.in

@@ -15,7 +15,7 @@ DISTFILES = Makefile.in Makefile.win
 
 SUBDIRS = profile $(R_PKGS_BASE) translations Recommended
 
-R_EXE = $(top_builddir)/bin/R --vanilla --slave
+R_EXE = $(top_builddir)/bin/R --vanilla --no-echo
 
 .SUFFIXES: .inn .Rdts .Rdh
 

src/library/Makefile.win

@@ -14,7 +14,7 @@ MKINSTALLDIRS = mkdir -p
 INSTALL_DATA = cp
 RVER = $(shell cut -d' ' -f1 ../../VERSION | sed -n 1p)
 
-R_EXE = $(top_builddir)/$(BINDIR)/Rterm --vanilla --slave
+R_EXE = $(top_builddir)/$(BINDIR)/Rterm --vanilla --no-echo
 
 .SUFFIXES: .Rdts
 

src/library/base/Makefile.in

@@ -18,7 +18,7 @@ pkg = base
 RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R $(srcdir)/R/$(R_OSTYPE)/*.R`
 
 ## avoid bootstrapping issue with internal tzcode.
-R_EXE = TZ=UTC $(top_builddir)/bin/R --vanilla --slave
+R_EXE = TZ=UTC $(top_builddir)/bin/R --vanilla --no-echo
 
 ## For people who do make -C ../src/library/base
 update:

src/library/base/man/options.Rd

@@ -155,7 +155,7 @@ getOption(x, default = NULL)
 
     \item{\code{echo}:}{logical.  Only used in non-interactive mode,
       when it controls whether input is echoed.  Command-line option
-      \option{--slave} sets this to \code{FALSE}, but otherwise
+      \option{--no-echo} sets this to \code{FALSE}, but otherwise
       it starts the session as \code{TRUE}.}
 
     \item{\code{encoding}:}{The name of an encoding, default