[Tramp-checkins] CVS: tramp/lisp ChangeLog,2.95,2.96 tramp.el,2.95,2.96

[Kai Gro?j. <ka...@us...>]

Update of /cvsroot/tramp/tramp/lisp
In directory usw-pr-cvs1:/tmp/cvs-serv25920/tramp/lisp

Modified Files:
	ChangeLog tramp.el 
Log Message:
* tramp.texi (Inline methods): Document the `km', `plinku' and
`plinkm' methods.

* tramp.el (file-expand-wildcards): Advise it even on Emacs 21.
(tramp-methods): New methods "plinku" and "plinkm".
"plinku" was suggested by Adam Przepiórkowski.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.95
retrieving revision 2.96
diff -C2 -d -r2.95 -r2.96
*** ChangeLog	10 Apr 2002 17:16:25 -0000	2.95
--- ChangeLog	14 Apr 2002 12:30:35 -0000	2.96
***************
*** 1,2 ****
--- 1,8 ----
+ 2002-04-14  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+ 
+ 	* tramp.el (file-expand-wildcards): Advise it even on Emacs 21.
+ 	(tramp-methods): New methods "plinku" and "plinkm".
+ 	"plinku" was suggested by Adam Przepiórkowski.
+ 
  2002-04-10  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
  

Index: tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.95
retrieving revision 2.96
diff -C2 -d -r2.95 -r2.96
*** tramp.el	10 Apr 2002 17:16:25 -0000	2.95
--- tramp.el	14 Apr 2002 12:30:35 -0000	2.96
***************
*** 530,533 ****
--- 530,566 ----
  	      (tramp-telnet-program       nil)
                (tramp-telnet-args          nil))
+      ("plinku"
+               (tramp-connection-function  tramp-open-connection-rsh)
+ 	      (tramp-rsh-program          "plink")
+ 	      (tramp-rcp-program          nil)
+ 	      (tramp-remote-sh            "/bin/sh")
+ 	      (tramp-rsh-args             ("-ssh")) ;optionally add "-v"
+ 	      (tramp-rcp-args             nil)
+ 	      (tramp-rcp-keep-date-arg    nil)
+ 	      (tramp-su-program           nil)
+ 	      (tramp-su-args              nil)
+               (tramp-encoding-command     "uuencode xxx")
+               (tramp-decoding-command
+                "( uudecode -o - 2>/dev/null || uudecode -p 2>/dev/null )")
+ 	      (tramp-encoding-function    nil)
+ 	      (tramp-decoding-function    uudecode-decode-region)
+ 	      (tramp-telnet-program       nil)
+               (tramp-telnet-args          nil))
+      ("plinkm"
+               (tramp-connection-function  tramp-open-connection-rsh)
+ 	      (tramp-rsh-program          "plink")
+ 	      (tramp-rcp-program          nil)
+ 	      (tramp-remote-sh            "/bin/sh")
+ 	      (tramp-rsh-args             ("-ssh")) ;optionally add "-v"
+ 	      (tramp-rcp-args             nil)
+ 	      (tramp-rcp-keep-date-arg    nil)
+ 	      (tramp-su-program           nil)
+ 	      (tramp-su-args              nil)
+ 	      (tramp-encoding-command     "mimencode -b")
+ 	      (tramp-decoding-command     "mimencode -u -b")
+ 	      (tramp-encoding-function    base64-encode-region)
+ 	      (tramp-decoding-function    base64-decode-region)
+ 	      (tramp-telnet-program       nil)
+               (tramp-telnet-args          nil))
       )
    "*Alist of methods for remote files.
***************
*** 1345,1349 ****
  	 (host   (tramp-file-name-host v))
  	 (path   (tramp-file-name-path v)))
!     (if (string= path "")
  	;; For a filename like "/[foo]", we return "/".  The `else'
  	;; case would return "/[foo]" unchanged.  But if we do that,
--- 1378,1382 ----
  	 (host   (tramp-file-name-host v))
  	 (path   (tramp-file-name-path v)))
!     (if (or (string= path "") (string= path "/"))
  	;; For a filename like "/[foo]", we return "/".  The `else'
  	;; case would return "/[foo]" unchanged.  But if we do that,
***************
*** 4850,4868 ****
  ;; Another problem is that the check is done by Emacs version, which
  ;; is really not what we want to do.  Oh, well.
! (when (and (not (featurep 'xemacs))
! 	   (= emacs-major-version 20))
!   (defadvice file-expand-wildcards (around tramp-fix activate)
!     (let ((name (ad-get-arg 0)))
!       (if (tramp-tramp-file-p name)
! 	  ;; If it's a Tramp file, dissect it and look if wildcards
! 	  ;; need to be expanded at all.
! 	  (let ((v (tramp-dissect-file-name name)))
! 	    (if (string-match "[[*?]" (tramp-file-name-path v))
! 		(let ((res ad-do-it))
! 		  (setq ad-return-value (or res (list name))))
! 	      (setq ad-return-value (list name))))
! 	;; If it is not a Tramp file, just run the original function.
! 	(let ((res ad-do-it))
! 	  (setq ad-return-value (or res (list name))))))))
  
  ;; Make the `reporter` functionality available for making bug reports about
--- 4883,4904 ----
  ;; Another problem is that the check is done by Emacs version, which
  ;; is really not what we want to do.  Oh, well.
! 
! ;;(when (and (not (featurep 'xemacs))
! ;;	   (= emacs-major-version 20))
! ;; It seems that this advice is needed in Emacs 21, too.
! (defadvice file-expand-wildcards (around tramp-fix activate)
!   (let ((name (ad-get-arg 0)))
!     (if (tramp-tramp-file-p name)
! 	;; If it's a Tramp file, dissect it and look if wildcards
! 	;; need to be expanded at all.
! 	(let ((v (tramp-dissect-file-name name)))
! 	  (if (string-match "[[*?]" (tramp-file-name-path v))
! 	      (let ((res ad-do-it))
! 		(setq ad-return-value (or res (list name))))
! 	    (setq ad-return-value (list name))))
!       ;; If it is not a Tramp file, just run the original function.
!       (let ((res ad-do-it))
! 	(setq ad-return-value (or res (list name)))))))
! ;;  )
  
  ;; Make the `reporter` functionality available for making bug reports about