From bdec806848ed7286ad56865b5f53b99dc0965810 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 7 Mar 2012 19:22:02 -0800
Subject: [PATCH] rustdoc: Look for pandoc in ~/.cabal

---
 src/rustdoc/config.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index bcc3d53fd08..79bc9a2743b 100644
--- a/src/rustdoc/config.rs
+++ b/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 { [] }
+        }
       }
     };