comparison lisp/net/tramp.el @ 78887:8faf94b6c420

* net/tramp.el (tramp-completion-mode-p): Rename from `tramp-completion-mode'. Revert logic, check `return', `newline' and such alike. Packages like Icicles tend to use other completion characters but `tab' and `space' only. (top): Require cl.el, when `copy-tree' is not available otherwise. * net/tramp-vc.el (tramp-vc-user-login-name): Get argument by `ad-get-arg'. Use `vc-find-version' instead of `process-file' to check whether we have a new enough vc that doesn't need the defadvice.

78886:da3f83794d1f

(unless (and (fboundp 'base64-encode-region)
	     (fboundp 'base64-decode-region))
  (require 'base64))                       ;for the mimencode methods
(require 'shell)
(require 'advice)

(autoload 'tramp-uuencode-region "tramp-uu"
  "Implementation of `uuencode' in Lisp.")
(add-hook 'tramp-unload-hook
	  '(lambda ()

	    ,(and (eq inhibit-file-name-operation operation)
		  inhibit-file-name-handlers)))
	 (inhibit-file-name-operation operation))
    (apply operation args))))

;; This function is used from `tramp-completion-file-name-handler' functions
;; only, if `tramp-completion-mode' is true. But this cannot be checked here
;; because the check is based on a full filename, not available for all
;; basic I/O operations.
;;;###autoload
(progn (defun tramp-completion-run-real-handler (operation args)
  "Invoke `tramp-file-name-handler' for OPERATION.
First arg specifies the OPERATION, second arg is a list of arguments to
pass to the OPERATION."

Falls back to normal file name handler if no tramp file name handler exists."
;;  (setq edebug-trace t)
;;  (edebug-trace "%s" (with-output-to-string (backtrace)))
  (save-match-data
    (let* ((filename (apply 'tramp-file-name-for-operation operation args))
	   (completion (tramp-completion-mode filename))
	   (foreign (tramp-find-foreign-file-name-handler filename)))
      (with-parsed-tramp-file-name filename nil
	(cond
	 ;; When we are in completion mode, some operations shouldn' be
	 ;; handled by backend.

;; shouldn't have partial tramp file name syntax. Maybe another variable should
;; be introduced overwriting this check in such cases. Or we change tramp
;; file name syntax in order to avoid ambiguities, like in XEmacs ...
;; In case of non unified file names it can be always true (and wouldn't be
;; necessary, because there are different regexp).
(defun tramp-completion-mode (file)
  "Checks whether method / user name / host name completion is active."
  (cond
   (tramp-completion-mode t)
   ((string-match "^/.*:.*:$" file) nil)
   ((string-match
     (concat tramp-prefix-regexp
      "\\(" tramp-method-regexp  "\\)" tramp-postfix-single-method-regexp "$")
     file)
    (member (match-string 1 file) (mapcar 'car tramp-methods)))
   ((or (equal last-input-event 'tab)
  	;; Emacs
  	(and (natnump last-input-event)
	     (or
	      ;; ?\t has event-modifier 'control
	      (char-equal last-input-event ?\t)
	      (and (not (event-modifiers last-input-event))
		   (or (char-equal last-input-event ?\?)
		       (char-equal last-input-event ?\ )))))
	;; XEmacs
	(and (featurep 'xemacs)
	     ;; `last-input-event' might be nil.
	     (not (null last-input-event))
	     ;; `last-input-event' may have no character approximation.
	     (funcall (symbol-function 'event-to-character) last-input-event)
	     (or
	      ;; ?\t has event-modifier 'control
	      (char-equal
	       (funcall (symbol-function 'event-to-character)
			last-input-event) ?\t)
	      (and (not (event-modifiers last-input-event))
		   (or (char-equal
			(funcall (symbol-function 'event-to-character)
				 last-input-event) ?\?)
		       (char-equal
			(funcall (symbol-function 'event-to-character)
				 last-input-event) ?\ ))))))
    t)))

;; Method, host name and user name completion.
;; `tramp-completion-dissect-file-name' returns a list of
;; tramp-file-name structures. For all of them we return possible completions.

;;   name is a Tramp name.
;; * Username and hostname completion.
;; ** If `partial-completion-mode' isn't loaded, "/foo:bla" tries to
;;    connect to host "blabla" already if that host is unique. No idea
;;    how to suppress. Maybe not an essential problem.
;; ** Try to avoid usage of `last-input-event' in `tramp-completion-mode'.
;; ** Extend `tramp-get-completion-su' for NIS and shadow passwords.
;; ** Unify `tramp-parse-{rhosts,shosts,sconfig,hosts,passwd,netrc}'.
;;    Code is nearly identical.
;; ** Decide whiche files to take for searching user/host names depending on
;;    operating system (windows-nt) in `tramp-completion-function-alist'.

78887:8faf94b6c420

(unless (and (fboundp 'base64-encode-region)
	     (fboundp 'base64-decode-region))
  (require 'base64))                       ;for the mimencode methods
(require 'shell)
(require 'advice)

;; `copy-tree' is part of subr.el since Emacs 22.
(eval-when-compile
  (unless (functionp 'copy-tree)
    (require 'cl)))

(autoload 'tramp-uuencode-region "tramp-uu"
  "Implementation of `uuencode' in Lisp.")
(add-hook 'tramp-unload-hook
	  '(lambda ()

	    ,(and (eq inhibit-file-name-operation operation)
		  inhibit-file-name-handlers)))
	 (inhibit-file-name-operation operation))
    (apply operation args))))

;; This function is used from `tramp-completion-file-name-handler'
;; functions only, if `tramp-completion-mode-p' is true. But this
;; cannot be checked here because the check is based on a full
;; filename, not available for all basic I/O operations.
;;;###autoload
(progn (defun tramp-completion-run-real-handler (operation args)
  "Invoke `tramp-file-name-handler' for OPERATION.
First arg specifies the OPERATION, second arg is a list of arguments to
pass to the OPERATION."

Falls back to normal file name handler if no tramp file name handler exists."
;;  (setq edebug-trace t)
;;  (edebug-trace "%s" (with-output-to-string (backtrace)))
  (save-match-data
    (let* ((filename (apply 'tramp-file-name-for-operation operation args))
	   (completion (tramp-completion-mode-p filename))
	   (foreign (tramp-find-foreign-file-name-handler filename)))
      (with-parsed-tramp-file-name filename nil
	(cond
	 ;; When we are in completion mode, some operations shouldn' be
	 ;; handled by backend.

;; shouldn't have partial tramp file name syntax. Maybe another variable should
;; be introduced overwriting this check in such cases. Or we change tramp
;; file name syntax in order to avoid ambiguities, like in XEmacs ...
;; In case of non unified file names it can be always true (and wouldn't be
;; necessary, because there are different regexp).
(defun tramp-completion-mode-p (file)
  "Checks whether method / user name / host name completion is active."
  (cond
   (tramp-completion-mode t)
   ((string-match "^/.*:.*:$" file) nil)
   ((string-match
     (concat tramp-prefix-regexp
      "\\(" tramp-method-regexp  "\\)" tramp-postfix-single-method-regexp "$")
     file)
    (member (match-string 1 file) (mapcar 'car tramp-methods)))
   ((or
     ;; Emacs
     (not (memq last-input-event '(return newline)))
     (and (natnump last-input-event)
	  (not (char-equal last-input-event ?\n))
	  (not (char-equal last-input-event ?\r)))
     ;; XEmacs
     (and (featurep 'xemacs)
	  ;; `last-input-event' might be nil.
	  (not (null last-input-event))
	  ;; `last-input-event' may have no character approximation.
	  (funcall (symbol-function 'event-to-character) last-input-event)
	  (not (char-equal
		(funcall (symbol-function 'event-to-character)
			 last-input-event) ?\n))
	  (not (char-equal
		(funcall (symbol-function 'event-to-character)
			 last-input-event) ?\r))))
    t)))

;; Method, host name and user name completion.
;; `tramp-completion-dissect-file-name' returns a list of
;; tramp-file-name structures. For all of them we return possible completions.

;;   name is a Tramp name.
;; * Username and hostname completion.
;; ** If `partial-completion-mode' isn't loaded, "/foo:bla" tries to
;;    connect to host "blabla" already if that host is unique. No idea
;;    how to suppress. Maybe not an essential problem.
;; ** Try to avoid usage of `last-input-event' in `tramp-completion-mode-p'.
;; ** Extend `tramp-get-completion-su' for NIS and shadow passwords.
;; ** Unify `tramp-parse-{rhosts,shosts,sconfig,hosts,passwd,netrc}'.
;;    Code is nearly identical.
;; ** Decide whiche files to take for searching user/host names depending on
;;    operating system (windows-nt) in `tramp-completion-function-alist'.