Merge branch 'fix/guide-with-null-breaks'

Author: wch

R/scale-.r

@@ -44,6 +44,10 @@ continuous_scale <- function(aesthetics, scale_name, palette, name = NULL, break
   if (bad_labels) {
     stop("Breaks and labels have unequal lengths", call. = FALSE)
   }
+
+  if (is.null(breaks) && !is_position_aes(aesthetics) && guide != "none") {
+    guide <- "none"
+  }
 
   trans <- as.trans(trans)
   if (!is.null(limits)) {
@@ -125,7 +129,11 @@ discrete_scale <- function(aesthetics, scale_name, palette, name = NULL, breaks
   if (bad_labels) {
     stop("Breaks and labels have unequal lengths", call. = FALSE)
   }
-  
+
+  if (is.null(breaks) && !is_position_aes(aesthetics) && guide != "none") {
+    guide <- "none"
+  }
+
   structure(list(
     call = match.call(),