Permalink
Browse files

tweaks

git-svn-id: https://svn.r-project.org/R/trunk@60931 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 053c00d commit dd950ef4dbca94ca4cfab462b6059c099d927b71 ripley committed Oct 13, 2012
View
6 doc/NEWS.Rd
@@ -59,9 +59,6 @@
which is representable as an integer (as often happens for package
\CRANpkg{Matrix}), this is converted to an integer.
- \item On Windows, the C stack size has been increased to 64MB (it
- has been 10MB since the days of 32MB RAM systems).
-
On other OSes the stack size is set at run time rather than when
compiling.
@@ -664,6 +661,9 @@
\code{"hyman"}, an implementation of Hyman's method of
constructing monotonic interpolation splines. (Based on
contributions of Simon Wood and Rob Hyndman.)
+
+ \item On Windows, the C stack size has been increased to 64MB (it
+ has been 10MB since the days of 32MB RAM systems).
}
}
View
19 src/library/base/man/locales.Rd
@@ -55,9 +55,7 @@ Sys.setlocale(category = "LC_ALL", locale = "")
POSIX. \code{"LC_MESSAGES"} will be \code{"C"} on systems that do not
support message translation, and is not supported on Windows. Trying
to use an unsupported category is an error for \code{Sys.setlocale}.
- Note that \code{"LC_MESSAGES"} is overruled by the \code{"LANGUAGE"}
- environment variable if that is set, see also \code{\link{LANGUAGE}}.
-
+
Note that setting category \code{"LC_ALL"} sets only
\code{"LC_COLLATE"}, \code{"LC_CTYPE"}, \code{"LC_MONETARY"} and
\code{"LC_TIME"}.
@@ -69,6 +67,10 @@ Sys.setlocale(category = "LC_ALL", locale = "")
\code{Sys.setlocale("LC_TYPE", )}, if that implies a different
character set) during a session may not work and are likely to lead to
some confusion.
+
+ Note that the \env{\link{LANGUAGE}} environment variable has
+ precedence over code{"LC_MESSAGES"} in selecting the language of
+ message translation on most \R platforms.
}
\value{
A character string of length one describing the locale in use (after
@@ -91,15 +93,14 @@ Sys.setlocale(category = "LC_ALL", locale = "")
anomalously, so gives a warning. Input conversions
in \R itself are unaffected, but the reading and writing of ASCII
\code{\link{save}} files will be, as may packages.
-#ifdef unix
- Setting it temporarily to produce graphical or text output may work
- well enough, but \code{\link{options}(OutDec)} is often preferable.
-#endif
-#ifdef windows
+
+ Setting it temporarily on a Unix-alike to produce graphical or text
+ output may work well enough, but \code{\link{options}(OutDec)} is
+ often preferable.
+
Almost all the output routines used by \R itself under Windows ignore
the setting of \code{"LC_NUMERIC"} since they make use of the Trio
library which is not internationalized.
-#endif
}
\note{
View
2 src/library/graphics/man/layout.Rd
@@ -63,7 +63,7 @@ lcm(x)
\references{
Murrell, P. R. (1999) Layouts: A mechanism for arranging plots on a page.
\emph{Journal of Computational and Graphical Statistics},
- \bold{8}, 121-134.
+ \bold{8}, 121--134.
Chapter 5 of Paul Murrell's Ph.D. thesis.
View
2 src/library/parallel/man/parallel-package.Rd
@@ -25,7 +25,7 @@
It contains functionality derived from and pretty much equivalent to
that contained in packages \CRANpkg{multicore} (with some low-level
functions renamed and not exported) and \CRANpkg{snow} (for socket
- clusters only, but MPI and NWSclusters generated by
+ clusters only, but MPI and NWS clusters generated by
\CRANpkg{snow} are also supported). This package also provides
\code{\link{makeForkCluster}}.
View
8 src/library/tools/man/checkFF.Rd
@@ -43,13 +43,13 @@ checkFF(package, dir, file, lib.loc = NULL,
reported as their symbols will be preferentially looked up in the DLL
named in the first \code{useDynLib} directive.
- As from \R 2.16.0, this also checks that calls with \code{PACKAGE}
+ As from \R 2.15.2, this also checks that calls with \code{PACKAGE}
specified are to the same package, and reports separately those which
are in base packages and those which are in other packages (and if
those packages are specified in the \file{DESCRIPTION} file). Direct
- calls to the FORTRAN entry points for LINPACK and LAPACK in \R itself
- are not reported (but this does not include modifications of LINPACK
- routines such as \code{dqrls}).
+ calls to the FORTRAN entry points for LINPACK in \R itself are not
+ reported (but this does not include modifications of LINPACK routines
+ such as \code{dqrls}).
}
\value{
An object of class \code{"checkFF"}, which currently is a list of the
View
4 src/main/coerce.c
@@ -2340,9 +2340,9 @@ SEXP attribute_hidden do_docall(SEXP call, SEXP op, SEXP args, SEXP rho)
SETCAR(c, VECTOR_ELT(args, i));
#else
SETCAR(c, mkPROMISE(VECTOR_ELT(args, i), rho));
- SET_PRVALUE(CAR(c), VECTOR_ELT(args, i)); */
+ SET_PRVALUE(CAR(c), VECTOR_ELT(args, i));
#endif
- if (ItemName(names, (int)i) != R_NilValue)
+ if (ItemName(names, (int)i) != R_NilValue)
SET_TAG(c, install(translateChar(ItemName(names, i))));
c = CDR(c);
}

0 comments on commit dd950ef

Please sign in to comment.