Merge pull request #708 from BrianDiggs/fix/ggdep

Fixes for gg_dep

Author: wch

R/scale-area.r

@@ -10,9 +10,9 @@
 #' @param range Range of output sizes.  Should be greater than 0.
 #' @export
 scale_area <- function(..., range = c(1, 6)) {
-  gg_dep("0.9.2",
-    "scale_area is deprecated. Use scale_size_area instead.\n",
-    "  Note that the behavior of scale_size_area is slightly different: \n",
-    "  by default it makes the area proportional to the numeric value.\n")
+  gg_dep("0.9.2", paste(sep = "\n",
+    "scale_area is deprecated. Use scale_size_area instead.",
+    "  Note that the behavior of scale_size_area is slightly different:",
+    "  by default it makes the area proportional to the numeric value."))
   continuous_scale("size", "area", area_pal(range), ...)
 }

R/theme.r

@@ -327,9 +327,9 @@ opts <- function(...) {
   elements <- list(...)
   if (!is.null(elements[["title"]])) {
     # This is kind of a hack, but fortunately it will be removed in future versions
-    gg_dep("0.9.1",
+    gg_dep("0.9.1", paste(sep = "\n",
       'Setting the plot title with opts(title="...") is deprecated.',
-      ' Use labs(title="...") or ggtitle("...") instead.')
+      ' Use labs(title="...") or ggtitle("...") instead.'))
 
     title <- elements$title
     elements$title <- NULL

R/utilities.r

@@ -232,7 +232,7 @@ if (packageVersion("plyr") <= package_version("1.7.1")) {
 #'
 #' @param version The last version of ggplot2 where this function was good
 #'   (in other words, the last version where it was not deprecated).
-#' @param message The message to print.
+#' @param msg The message to print.
 #' @export
 gg_dep <- function(version, msg) {
   v <- as.package_version(version)
@@ -242,7 +242,7 @@ gg_dep <- function(version, msg) {
   #  current minor number is more than 1 greater than last-good minor number,
   #  give error.
   if (cv[[1,1]] > v[[1,1]]  ||  cv[[1,2]] > v[[1,2]] + 1) {
-    error(msg, " (Defunct; last used in version ", version, ")",
+    stop(msg, " (Defunct; last used in version ", version, ")",
       call. = FALSE)
 
   # If minor number differs by one, give warning

man/gg_dep.Rd

@@ -9,7 +9,7 @@
   function was good (in other words, the last version where
   it was not deprecated).}
 
-  \item{message}{The message to print.}
+  \item{msg}{The message to print.}
 }
 \description{
   Version numbers have the format