mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* eshell/esh-util.el (top): Require also Tramp when compiling.

Browse source 
(eshell-directory-files-and-attributes): Check for FTP remote
connection.
(eshell-parse-ange-ls): Let-bind `ange-ftp-name-format',
`ange-ftp-ftp-name-arg', `ange-ftp-ftp-name-res'.
(eshell-file-attributes): Handle ".".  Return `entry'.
This commit is contained in:
Michael Albinus 2009-11-29 20:19:48 +00:00
parent e7b538cd65
commit 61eef560b9
2 changed files with 49 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/ChangeLog
View file

@ -1,3 +1,26 @@
2009-11-29 Michael Albinus <michael.albinus@gmx.de>
Improve integration of Tramp and ange-ftp in eshell.
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
(eshell/su): Flatten args. Apply better args parsing. Use "cd".
(eshell/sudo): Flatten args. Let-bind `default-directory'.
* eshell/esh-util.el (top): Require also Tramp when compiling.
(eshell-directory-files-and-attributes): Check for FTP remote
connection.
(eshell-parse-ange-ls): Let-bind `ange-ftp-name-format',
`ange-ftp-ftp-name-arg', `ange-ftp-ftp-name-res'.
(eshell-file-attributes): Handle ".". Return `entry'.
* net/ange-ftp.el (ange-ftp-parse-filename): Use `save-match-data'.
(ange-ftp-directory-files-and-attributes)
(ange-ftp-real-directory-files-and-attributes): New defuns.
* net/tramp.el (tramp-maybe-open-connection): Open the remote
shell with "exec" when possible. This prevents trailing prompts
in `start-file-process'.
2009-11-28 Stefan Monnier <monnier@iro.umontreal.ca>
Try and remove assumptions about point-min==1.

43
lisp/eshell/esh-util.el
View file

@ -613,20 +613,14 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
"Make sure to use the handler for `directory-file-and-attributes'."
(let* ((dir (expand-file-name dir))
(dfh (find-file-name-handler dir 'directory-files)))
(if (not dfh)
(directory-files-and-attributes dir full match nosort id-format)
(let ((files (funcall dfh 'directory-files dir full match nosort))
(fah (find-file-name-handler dir 'file-attributes)))
(mapcar
(function
(lambda (file)
(cons file (if fah
(eshell-file-attributes
(expand-file-name file dir))
(file-attributes (expand-file-name file dir))))))
files)))))
(let* ((dir (expand-file-name dir)))
(if (string-equal (file-remote-p dir 'method) "ftp")
(let ((files (directory-files dir full match nosort)))
(mapcar
(lambda (file)
(cons file (eshell-file-attributes (expand-file-name file dir))))
files))
(directory-files-and-attributes dir full match nosort id-format))))
(defun eshell-current-ange-uids ()
(if (string-match "/\\([^@]+\\)@\\([^:]+\\):" default-directory)
@ -643,10 +637,23 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(autoload 'parse-time-string "parse-time"))
(eval-when-compile
(require 'ange-ftp nil t))
(require 'ange-ftp nil t)
(require 'tramp nil t))
(defun eshell-parse-ange-ls (dir)
(let (entry)
(let ((ange-ftp-name-format
(list (nth 0 tramp-file-name-structure)
(nth 3 tramp-file-name-structure)
(nth 2 tramp-file-name-structure)
(nth 4 tramp-file-name-structure)))
;; ange-ftp uses `ange-ftp-ftp-name-arg' and `ange-ftp-ftp-name-res'
;; for optimization in `ange-ftp-ftp-name'. If Tramp wasn't active,
;; there could be incorrect values from previous calls in case the
;; "ftp" method is used in the Tramp file name. So we unset
;; those values.
(ange-ftp-ftp-name-arg "")
(ange-ftp-ftp-name-res nil)
entry)
(with-temp-buffer
(insert (ange-ftp-ls dir "-la" nil))
(goto-char (point-min))
@ -701,6 +708,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(if (string-equal (file-remote-p file 'method) "ftp")
(let ((base (file-name-nondirectory file))
(dir (file-name-directory file)))
(if (string-equal "" base) (setq base "."))
(if (boundp 'ange-cache)
(setq entry (cdr (assoc base (cdr (assoc dir ange-cache))))))
(unless entry
@ -713,7 +721,8 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(let ((fentry (assoc base (cdr entry))))
(if fentry
(setq entry (cdr fentry))
(setq entry nil))))))
(setq entry nil)))))
entry)
(file-attributes file))))
(defalias 'eshell-copy-tree 'copy-tree)