From: John Wiegley <johnw@newartisans.com>
Date: Thu, 17 Jul 2008 08:44:20 +0000 (+0000)
Subject: 2008-07-17  Fan Kai  <fktpp@xemacs.org>
X-Git-Tag: emacs-pretest-23.0.90~4114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70357d07233119dc37ce23bfd96eea96bc9c0c5b;p=emacs.git

2008-07-17  Fan Kai  <fktpp@xemacs.org>

	* esh-arg.el (eshell-quote-backslash): Fix eshell path completion
	for Windows.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65b7e033a96..d3d126f7daf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-17  Fan Kai  <fktpp@xemacs.org>
+
+	* esh-arg.el (eshell-quote-backslash): Fix eshell path completion
+	for Windows.
+
 2008-07-17  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa.el (epa-key-list-mode): Use run-mode-hooks.
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 7e86772e797..d6dd5b23d0f 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -282,7 +282,11 @@ Point is left at the end of the arguments."
   "Intelligently backslash the character occurring in STRING at INDEX.
 If the character is itself a backslash, it needs no escaping."
   (let ((char (aref string index)))
-    (if (eq char ?\\)
+    (if (and (eq char ?\\) 
+	     (not (and (featurep 'mswindows)
+		       (eq directory-sep-char ?\\)
+		       (eq (1- (string-width string))
+			   index))))
 	(char-to-string char)
       (if (memq char eshell-special-chars-outside-quoting)
 	  (string ?\\ char)))))