Skip to content

Commit f2e7396

Browse files
author
hornik
committed
Tweak .check_package_parseRd() to also get encoding for base packages.
git-svn-id: https://svn.r-project.org/R/trunk@88467 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent d894487 commit f2e7396

File tree

1 file changed

+3
-5
lines changed
  • src/library/tools/R

1 file changed

+3
-5
lines changed

src/library/tools/R/QC.R

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7177,11 +7177,9 @@ function(cfile, dir = NULL)
71777177
.check_package_parseRd <-
71787178
function(dir, silent = FALSE, def_enc = FALSE, minlevel = -1)
71797179
{
7180-
if(file.exists(dfile <- file.path(dir, "DESCRIPTION"))) {
7181-
enc <- read.dcf(dfile)[1L, ]["Encoding"]
7182-
if(is.na(enc)) enc <- "ASCII"
7183-
else def_enc <- TRUE
7184-
} else enc <- "ASCII"
7180+
enc <- .get_package_metadata(dir)["Encoding"]
7181+
if(is.na(enc)) enc <- "ASCII"
7182+
else def_enc <- TRUE
71857183
macros <- loadPkgRdMacros(dir)
71867184
## UGLY! FIXME: add (something like) 'dir' as argument to checkRd() below!
71877185
oenv <- Sys.getenv("_R_RD_MACROS_PACKAGE_DIR_", unset = NA)

0 commit comments

Comments
 (0)