From: Glenn Morris Date: Fri, 18 Jul 2008 06:56:05 +0000 (+0000) Subject: (eshell-quote-backslash): Restrict previous change to XEmacs, since it X-Git-Tag: emacs-pretest-23.0.90~4095 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec04db35d0caebe22720a9ed851d6d7e9dceb2a1;p=emacs.git (eshell-quote-backslash): Restrict previous change to XEmacs, since it does nothing for Emacs. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7782a13b41c..20a14d0fd14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-07-18 Glenn Morris + + * eshell/esh-arg.el (eshell-quote-backslash): Restrict previous change + to XEmacs, since it does nothing for Emacs. + 2008-07-18 Katsumi Yamaoka * net/tls.el (open-tls-stream): Make it work with the 2nd argument diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index d6dd5b23d0f..c2574e5e55d 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -1,7 +1,7 @@ ;;; esh-arg.el --- argument processing -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: John Wiegley @@ -282,8 +282,10 @@ 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 (and (eq char ?\\) - (not (and (featurep 'mswindows) + (if (and (eq char ?\\) + ;; In Emacs directory-sep-char is always ?/, so this does nothing. + (not (and (featurep 'xemacs) + (featurep 'mswindows) (eq directory-sep-char ?\\) (eq (1- (string-width string)) index))))