geom defaults: simplify name reorder logic

Author: dkahle

R/geom-defaults.r

@@ -16,7 +16,7 @@
 update_geom_defaults <- function(geom, new) {
   g <- check_subclass(geom, "Geom", env = parent.frame())
   old <- g$default_aes
-  g$default_aes[] <- defaults(rename_aes(new), old)[names(g$default_aes)]
+  g$default_aes[] <- defaults(rename_aes(new), old)[names(old)]
   invisible()
 }
 
@@ -25,6 +25,6 @@ update_geom_defaults <- function(geom, new) {
 update_stat_defaults <- function(stat, new) {
   g <- check_subclass(stat, "Stat", env = parent.frame())
   old <- g$default_aes
-  g$default_aes[] <- defaults(rename_aes(new), old)[names(g$default_aes)]
+  g$default_aes[] <- defaults(rename_aes(new), old)[names(old)]
   invisible()
 }