From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 9 Dec 2014 11:55:54 +0000 (-0500)
Subject: vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument list
X-Git-Tag: emacs-25.0.90~2635^2~133
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=baab20d73e2a3ee6a06dc83fe97d0b781870e29f;p=emacs.git

vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument list

* vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument list,
avoids problems witth names containing hyphens.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81afe8a5ccc..bf139d6e445 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+	* vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument
+	list, avoids problems witth names containing hyphens.
+
 2014-12-09  Wilson Snyder  <wsnyder@wsnyder.org>
 
 	Sync with upstream verilog-mode revision aa4b777.
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index 3186d7254cb..36d6a20f9b1 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -193,7 +193,12 @@ For a description of possible values, see `vc-check-master-templates'."
 (defun vc-src-command (buffer file-or-list &rest flags)
   "A wrapper around `vc-do-command' for use in vc-src.el.
 This function differs from vc-do-command in that it invokes `vc-src-program'."
-  (apply 'vc-do-command (or buffer "*vc*") 0 vc-src-program file-or-list flags))
+  (let (file-list)
+    (cond ((stringp file-or-list)
+	   (setq file-list (list "--" file-or-list)))
+	  (file-or-list
+	   (setq file-list (cons "--" file-or-list))))
+    (apply 'vc-do-command (or buffer "*vc*") 0 vc-src-program file-list flags)))
 
 (defun vc-src-working-revision (file)
   "SRC-specific version of `vc-working-revision'."