---

yaml
---
r: 11695
b: refs/heads/master
c: bdec806
h: refs/heads/master
i:
  11693: c95b4e2
  11691: f9add63
  11687: c86aceb
  11679: e76fc25
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2bfed908e39f162532be56d9680295bb383ddcf2
+refs/heads/master: bdec806848ed7286ad56865b5f53b99dc0965810
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/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 { [] }
+        }
       }
     };