Merge pull request #317 from kohske/fix/annotate

hadley · hadley · commit 008312c0d9b2 · 2011-12-23T06:24:28.000-08:00
Fix a bug in annotate: move legend to show_guide.
diff --git a/R/annotation.r b/R/annotation.r
@@ -23,7 +23,7 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL, ymin =
     stat = "identity", 
     inherit.aes = FALSE,
     data = data.frame(layer_data), mapping = aes_all(names(layer_data)),
-    legend = FALSE
+    show_guide = FALSE
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL, ymin =`
`23`	`23`	`stat = "identity",`
`24`	`24`	`inherit.aes = FALSE,`
`25`	`25`	`data = data.frame(layer_data), mapping = aes_all(names(layer_data)),`
`26`		`- legend = FALSE`
	`26`	`+ show_guide = FALSE`
`27`	`27`	`)`
`28`	`28`	`}`
`29`	`29`