Merge branch 'chrismerkord-master'

Author: hadley

NEWS.md

@@ -1,5 +1,8 @@
 # ggplot2 2.0.0.9000
 
+* `facet_wrap()` correctly swaps `nrow` and `ncol` for facetting vertically
+  (#1417).
+
 * For geoms with both `colour` and `fill`, `alpha` once again only affects
   fill (Reverts #1371, #1523). This was causing problems for people.
 

R/facet-wrap.r

@@ -86,8 +86,10 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
 
   if (identical(dir, "v")) {
     # swap
-    nrow <- sanitise_dim(ncol)
-    ncol <- sanitise_dim(nrow)
+    nrow_swap <- ncol
+    ncol_swap <- nrow
+    nrow <- sanitise_dim(nrow_swap)
+    ncol <- sanitise_dim(ncol_swap)
   } else {
     nrow <- sanitise_dim(nrow)
     ncol <- sanitise_dim(ncol)