Skip to content

Commit 1c8173f

Browse files
author
maechler
committed
cosmetic
git-svn-id: https://svn.r-project.org/R/trunk@88172 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 27f6485 commit 1c8173f

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/library/utils/R/databrowser.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# File src/library/utils/R/databrowser.R
22
# Part of the R package, https://www.R-project.org
33
#
4-
# Copyright (C) 1995-2013 The R Core Team
4+
# Copyright (C) 1995-2020 The R Core Team
55
#
66
# This program is free software; you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -199,7 +199,7 @@ wsbrowser <- function(IDS, IsRoot, IsContainer, ItemsPerContainer,
199199
entry <- function(ch) paste0("<td>",ch,"</td>")
200200
Par <- function(ch) paste0("<P>",ch,"</P>")
201201
Trow <- function(N, ...) {
202-
if(length(list(...)) != N) stop("wrong number of table row entries")
202+
if(...length() != N) stop("wrong number of table row entries")
203203
paste("<tr>", ..., "</tr>\n")
204204
}
205205
catRow <- function(...) cat(Trow(nCol, ...), file = Hfile)

src/library/utils/R/sessionInfo.R

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# File src/library/utils/R/sessionInfo.R
22
# Part of the R package, https://www.R-project.org
33
#
4-
# Copyright (C) 1995-2024 The R Core Team
4+
# Copyright (C) 1995-2025 The R Core Team
55
#
66
# This program is free software; you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -165,10 +165,8 @@ print.sessionInfo <- function(x, locale = TRUE, tzone = locale,
165165
if (!is.null(x$running)) cat("Running under: ", x$running, "\n", sep = "")
166166
cat("\n")
167167
cat("Matrix products: ", x$matprod, "\n", sep = "")
168-
blas <- x$BLAS
169-
if (is.null(blas)) blas <- ""
170-
lapack <- x$LAPACK
171-
if (is.null(lapack)) lapack <- ""
168+
blas <- x$BLAS %||% ""
169+
lapack <- x$LAPACK %||% ""
172170
if (blas == lapack && nzchar(blas))
173171
cat("BLAS/LAPACK:", blas)
174172
else {

0 commit comments

Comments
 (0)