From 5305e9d39ec0b2fa7d26b9ae112121848ffe02f7 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Wed, 16 Sep 2009 08:03:08 -0800 Subject: [PATCH] * p4-lowlevel.el (p4-lowlevel-diff): Remove slash from directory name if needed. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7388] --- p4-lowlevel.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p4-lowlevel.el b/p4-lowlevel.el index dfed451..325c272 100644 --- a/p4-lowlevel.el +++ b/p4-lowlevel.el @@ -426,7 +426,7 @@ to pass to `p4 diff'. If optional BUFFER is non-nil, put output in that buffer." (setq rev (p4-lowlevel-canonicalize-revision rev)) (when (file-directory-p file) - (setq file (concat file "/..."))) + (setq file (concat (directory-file-name file) "/..."))) (let* ((file-spec (if rev (concat file rev) file)) (diff-args (append (list "diff") p4-lowlevel-diff-switches (list "-f" "-t" file-spec)))