# HG changeset patch
# User John Wiegley <johnw@newartisans.com>
# Date 1216284260 0
# Node ID b117e2fe7552037cb47eb202c0908057d1bc38b5
# Parent  b056a93eb26f73f5776c7deaf48c300a4f6e2ccd
2008-07-17  Fan Kai  <fktpp@xemacs.org>

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

diff -r b056a93eb26f -r b117e2fe7552 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jul 17 06:21:14 2008 +0000
+++ b/lisp/ChangeLog	Thu Jul 17 08:44:20 2008 +0000
@@ -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 -r b056a93eb26f -r b117e2fe7552 lisp/eshell/esh-arg.el
--- a/lisp/eshell/esh-arg.el	Thu Jul 17 06:21:14 2008 +0000
+++ b/lisp/eshell/esh-arg.el	Thu Jul 17 08:44:20 2008 +0000
@@ -282,7 +282,11 @@
   "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)))))