Merge pull request #1034 from setempler/patch

hadley · hadley · commit 380c3b105c1a · 2015-06-11T14:51:44.000-05:00
layer.r: added missing error message newline/spacer
diff --git a/R/layer.r b/R/layer.r
@@ -154,8 +154,8 @@ Layer <- proto(expr = {
 
     wrong <- lengths != 1 & lengths != n
     if (any(wrong)) {
-      stop("Aesthetics must either be length one, or the same length as the data",
-        "Problems:", paste(aesthetics[wrong], collapse = ", "), call. = FALSE)
+      stop("Aesthetics must either be length one, or the same length as the data.",
+        "\nProblems: ", paste(aesthetics[wrong], collapse = ", "), call. = FALSE)
     }
 
     if (empty(data) && n > 0) {

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,8 @@ Layer <- proto(expr = {`
`154`	`154`
`155`	`155`	`wrong <- lengths != 1 & lengths != n`
`156`	`156`	`if (any(wrong)) {`
`157`		`- stop("Aesthetics must either be length one, or the same length as the data",`
`158`		`- "Problems:", paste(aesthetics[wrong], collapse = ", "), call. = FALSE)`
	`157`	`+ stop("Aesthetics must either be length one, or the same length as the data.",`
	`158`	`+ "\nProblems: ", paste(aesthetics[wrong], collapse = ", "), call. = FALSE)`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`if (empty(data) && n > 0) {`