From: Michael Albinus Date: Tue, 25 May 2010 13:33:55 +0000 (+0200) Subject: * net/tramp.el (tramp-handle-insert-directory): Don't use X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~192 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa9ba953352517801da5b0578bc78f2df6f898aa;p=emacs.git * net/tramp.el (tramp-handle-insert-directory): Don't use `forward-word', it's default syntax could be changed. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed0de283cd7..af6a03fd1aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-05-25 Christian Lynbech (tiny change) + + * net/tramp.el (tramp-handle-insert-directory): Don't use + `forward-word', it's default syntax could be changed. + 2010-05-25 Michael Albinus * net/tramp.el (tramp-progress-reporter-update): New defun. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 075e931878e..91b35481730 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4300,13 +4300,11 @@ This is like `dired-recursive-delete-directory' for Tramp files." (forward-line -2) (when (looking-at "//SUBDIRED//") (forward-line -1)) - (when (looking-at "//DIRED//") - (let ((end (tramp-compat-line-end-position)) - (linebeg (point))) + (when (looking-at "//DIRED//\\s-+") + (let ((databeg (match-end 0)) + (end (tramp-compat-line-end-position))) ;; Now read the numeric positions of file names. - (goto-char linebeg) - (forward-word 1) - (forward-char 3) + (goto-char databeg) (while (< (point) end) (let ((start (+ beg (read (current-buffer)))) (end (+ beg (read (current-buffer)))))