Merge with BOS
authormpm@selenic.com
Tue, 23 Aug 2005 15:15:14 -0700
changeset 1012 d74bcc61be6f
parent 1010 f46e809bbe87 (current diff)
parent 1011 d06420c90d8b (diff)
child 1013 2e8b8da9a86e
child 1025 ba08f2ef8cbe
Merge with BOS
--- a/contrib/mercurial.el
+++ b/contrib/mercurial.el
@@ -67,11 +67,10 @@
   :group 'tools)
 
 (defcustom hg-binary
-  (dolist (path '("~/bin/hg"
-		  "/usr/bin/hg"
-		  "/usr/local/bin/hg"))
-    (when (file-executable-p path)
-      (return path)))
+    (or (executable-find "hg")
+	(dolist (path '("~/bin/hg" "/usr/bin/hg" "/usr/local/bin/hg"))
+	  (when (file-executable-p path)
+	    (return path))))
   "The path to Mercurial's hg executable."
   :type '(file :must-match t)
   :group 'mercurial)