---

yaml
---
r: 14701
b: refs/heads/try
c: bdec806
h: refs/heads/master
i:
  14699: 52c5d3c
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 2bfed908e39f162532be56d9680295bb383ddcf2
+refs/heads/try: bdec806848ed7286ad56865b5f53b99dc0965810
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/config.rs

@@ -193,8 +193,12 @@ fn maybe_find_pandoc(
     let possible_pandocs = alt maybe_pandoc_cmd {
       some(pandoc_cmd) { [pandoc_cmd] }
       none {
-        // FIXME (1936): Need to be able to expand ~ to look in .cabal
-        ["pandoc"]
+        ["pandoc"] + alt os::homedir() {
+          some(dir) {
+            [path::connect(dir, ".cabal/bin/pandoc")]
+          }
+          none { [] }
+        }
       }
     };