[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog net/tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog net/tramp.el |
Date: |
Sat, 26 Dec 2009 20:04:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 09/12/26 20:04:48
Modified files:
lisp : ChangeLog
lisp/net : tramp.el
Log message:
* net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
switches. Check also for //SUBDIRED// line.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16916&r2=1.16917
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.277&r2=1.278
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16916
retrieving revision 1.16917
diff -u -b -r1.16916 -r1.16917
--- ChangeLog 23 Dec 2009 22:45:06 -0000 1.16916
+++ ChangeLog 26 Dec 2009 20:04:43 -0000 1.16917
@@ -1,3 +1,8 @@
+2009-12-26 Michael Albinus <address@hidden>
+
+ * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
+ switches. Check also for //SUBDIRED// line.
+
2009-12-23 Vinicius Jose Latorre <address@hidden>
* ps-print.el (ps-face-attributes): It was not returning the
Index: net/tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- net/tramp.el 17 Dec 2009 13:18:06 -0000 1.277
+++ net/tramp.el 26 Dec 2009 20:04:48 -0000 1.278
@@ -38,7 +38,7 @@
;;
;; This package only works for Emacs 21.1 and higher, and for XEmacs 21.4
;; and higher. For XEmacs 21, you need the package `fsf-compat' for
-;; the `with-timeout' macro.)
+;; the `with-timeout' macro.
;;
;; Also see the todo list at the bottom of this file.
;;
@@ -4079,6 +4079,8 @@
(setq switches (concat "-d " switches)))
(when wildcard
(setq switches (concat switches " " wildcard)))
+ (when (string-match "'" switches)
+ (setq switches (replace-match "\\\\'" nil nil switches)))
;; If `full-directory-p', we just say `ls -l FILENAME'.
;; Else we chdir to the parent directory, then say `ls -ld BASENAME'.
(if full-directory-p
@@ -4121,6 +4123,8 @@
;; Check for "--dired" output.
(forward-line -2)
+ (when (looking-at "//SUBDIRED//")
+ (forward-line -1))
(when (looking-at "//DIRED//")
(let ((end (tramp-compat-line-end-position))
(linebeg (point)))