changeset 1012:d74bcc61be6f

Merge with BOS
author mpm@selenic.com
date Tue, 23 Aug 2005 15:15:14 -0700
parents f46e809bbe87 (current diff) d06420c90d8b (diff)
children 2e8b8da9a86e ba08f2ef8cbe
files
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/mercurial.el	Tue Aug 23 14:21:19 2005 -0700
+++ b/contrib/mercurial.el	Tue Aug 23 15:15:14 2005 -0700
@@ -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)