procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(eshell-quote-backslash): Restrict previous change to XEmacs, since it

Browse source 
does nothing for Emacs.
This commit is contained in:
Glenn Morris 2008-07-18 06:56:05 +00:00
parent add4eecc5c
commit ec04db35d0
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-07-18 Glenn Morris <rgm@gnu.org>
* eshell/esh-arg.el (eshell-quote-backslash): Restrict previous change
to XEmacs, since it does nothing for Emacs.
2008-07-18 Katsumi Yamaoka <yamaoka@jpl.org>
* net/tls.el (open-tls-stream): Make it work with the 2nd argument

10
lisp/eshell/esh-arg.el
View file

@ -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 <johnw@gnu.org>
@ -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))))