--- tramp.el.orig	2009-12-14 10:22:18.000000000 +0000
+++ tramp.el	2009-12-14 15:49:39.687500000 +0000
@@ -593,6 +593,18 @@
          (tramp-copy-args            nil)
          (tramp-copy-keep-date       nil)
          (tramp-password-end-of-line nil))
+    ("plinks"
+     (tramp-login-program "plink")
+     (tramp-login-args
+      (("-load" "%h")
+       ("-P" "%p")
+       ("-ssh")))
+     (tramp-remote-sh "/bin/sh")
+     (tramp-copy-program nil)
+     (tramp-copy-args nil)
+     (tramp-copy-keep-date nil)
+     (tramp-password-end-of-line "xy")
+     (tramp-default-port 22))
     ("pscp"  (tramp-login-program        "plink")
          (tramp-login-args           (("%h") ("-l" "%u") ("-P" "%p")
                       ("-ssh")))
@@ -3241,7 +3253,7 @@
                           (tramp-shell-quote-argument localname)
                           (tramp-shell-quote-argument filename)
                           (if (symbol-value
-                   'read-file-name-completion-ignore-case)
+                   'completion-ignore-case)
                   1 0)))

               (format (concat
@@ -3972,7 +3984,7 @@
             (concat file ".z"))
                (t nil)))))))))

-(defun tramp-handle-dired-uncache (dir)
+(defun tramp-handle-dired-uncache (dir &optional dir-p) ;; XEmacs needs 2 args
   "Like `dired-uncache' for Tramp files."
   (with-parsed-tramp-file-name dir nil
     (tramp-flush-file-property v localname)))
@@ -7023,6 +7035,10 @@
        ;; The host name is used for the remote shell command.
        (member
         '("%h") (tramp-get-method-parameter method 'tramp-login-args))
+       ;; The host name is used by plink as the name of a session.
+       (member
+        '("-load" "%h")
+            (tramp-get-method-parameter method 'tramp-login-args))
        ;; The host is local.  We cannot use `tramp-local-host-p'
        ;; here, because it opens a connection as well.
        (string-match tramp-local-host-regexp host))