Re: tramp ($Id: tramp.el,v 1.8 2002/04/15 11:27:18 kaig Exp $); tramp-methods defcustom mismatch

[Kai.Grossjohann@CS.Uni-Dortmund.DE (K. )]

Andre Srinivasan <an...@sl...> writes:

> I noticed that when trying to customize tramp-methods, there appeared
> to be a mistmatch between the variable and the type.  After bit of
> playing, I found that tramp-su-program element was the culprit, but I
> can't figure out why.

Does the following patch fix it?

--- tramp.el.~2.101.~	Wed May 22 11:23:36 2002
+++ tramp.el	Tue Jun  4 14:32:18 2002
@@ -704,19 +704,29 @@
   :type '(repeat
           (cons string
                 (set (list (const tramp-connection-function) function)
-                     (list (const tramp-rsh-program) string)
-                     (list (const tramp-rcp-program) string)
-                     (list (const tramp-remote-sh) string)
+                     (list (const tramp-rsh-program)
+			   (choice (const nil) string))
+                     (list (const tramp-rcp-program)
+			   (choice (const nil) string))
+                     (list (const tramp-remote-sh)
+			   (choice (const nil) string))
                      (list (const tramp-rsh-args) (repeat string))
                      (list (const tramp-rcp-args) (repeat string))
-                     (list (const tramp-rcp-keep-date-arg) string)
-                     (list (const tramp-su-program) string)
+                     (list (const tramp-rcp-keep-date-arg)
+			   (choice (const nil) string))
+                     (list (const tramp-su-program)
+			   (choice (const nil) string))
                      (list (const tramp-su-args) (repeat string))
-                     (list (const tramp-encoding-command) string)
-                     (list (const tramp-decoding-command) string)
-                     (list (const tramp-encoding-function) function)
-                     (list (const tramp-decoding-function) function)
-                     (list (const tramp-telnet-program) string)
+                     (list (const tramp-encoding-command)
+			   (choice (const nil) string))
+                     (list (const tramp-decoding-command)
+			   (choice (const nil) string))
+                     (list (const tramp-encoding-function)
+			   (choice (const nil) function))
+                     (list (const tramp-decoding-function)
+			   (choice (const nil) function))
+                     (list (const tramp-telnet-program)
+			   (choice (const nil) string))
                      (list (const tramp-telnet-args) (repeat string))))))
 
 (defcustom tramp-multi-methods '("multi" "multiu")


kai
-- 
Silence is foo!