Mercurial > emacs
changeset 85542:8058fd4a5575
(tramp-handle-expand-many-files): Remove.
(PC-expand-many-files): Remove advice.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 22 Oct 2007 09:43:42 +0000 |
parents | e31d888e0891 |
children | 3688c29b5541 |
files | lisp/net/tramp.el |
diffstat | 1 files changed, 0 insertions(+), 55 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/tramp.el Mon Oct 22 09:35:55 2007 +0000 +++ b/lisp/net/tramp.el Mon Oct 22 09:43:42 2007 +0000 @@ -4514,61 +4514,6 @@ (add-hook 'tramp-unload-hook 'tramp-unload-file-name-handlers) -;;; Interactions with other packages: - -;; -- complete.el -- - -;; This function contributed by Ed Sabol -(defun tramp-handle-expand-many-files (name) - "Like `PC-expand-many-files' for Tramp files." - (with-parsed-tramp-file-name name nil - (save-match-data - (if (or (string-match "\\*" name) - (string-match "\\?" name) - (string-match "\\[.*\\]" name)) - (progn - (let (bufstr) - ;; CCC: To do it right, we should quote certain characters - ;; in the file name, but since the echo command is going to - ;; break anyway when there are spaces in the file names, we - ;; don't bother. - ;;-(let ((comint-file-name-quote-list - ;;- (set-difference tramp-file-name-quote-list - ;;- '(?\* ?\? ?[ ?])))) - ;;- (tramp-send-command - ;;- method user host - ;;- (format "echo %s" (comint-quote-filename localname)))) - (tramp-send-command v (format "echo %s" localname)) - (setq bufstr (buffer-substring - (point-min) (tramp-compat-line-end-position))) - (with-current-buffer (tramp-get-buffer v) - (goto-char (point-min)) - (if (string-equal localname bufstr) - nil - (insert "(\"") - (while (search-forward " " nil t) - (delete-backward-char 1) - (insert "\" \"")) - (goto-char (point-max)) - (delete-backward-char 1) - (insert "\")") - (goto-char (point-min)) - (mapcar - (lambda (x) (tramp-make-tramp-file-name method user host x)) - (read (current-buffer))))))) - (list (expand-file-name name)))))) - -(eval-after-load "complete" - '(progn - (defadvice PC-expand-many-files - (around tramp-advice-PC-expand-many-files (name) activate) - "Invoke `tramp-handle-expand-many-files' for Tramp files." - (if (tramp-tramp-file-p name) - (setq ad-return-value (tramp-handle-expand-many-files name)) - ad-do-it)) - (add-hook 'tramp-unload-hook - '(lambda () (ad-unadvise 'PC-expand-many-files))))) - ;;; File name handler functions for completion mode. (defvar tramp-completion-mode nil