[Emacs-diffs] /srv/bzr/emacs/trunk r111639: * net/tramp.el (tramp-tramp-file-p): Comment check for

[Michael Albinus]

------------------------------------------------------------
revno: 111639
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Thu 2013-01-31 09:33:03 +0100
message:
  * net/tramp.el (tramp-tramp-file-p): Comment check for
  `string-as-unibyte'.  The function does not exist on XEmacs, and
  likely we need another approach.
  
  * net/tramp-sh.el (tramp-compute-multi-hops): Check, whether
  `tramp-gw-*' variables are bound.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-31 06:35:45 +0000
+++ b/lisp/ChangeLog    2013-01-31 08:33:03 +0000
@@ -1,3 +1,12 @@
+2013-01-31  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-tramp-file-p): Comment check for
+       `string-as-unibyte'.  The function does not exist on XEmacs, and
+       likely we need another approach.
+
+       * net/tramp-sh.el (tramp-compute-multi-hops): Check, whether
+       `tramp-gw-*' variables are bound.
+
 2013-01-31  Glenn Morris  <address@hidden>
 
        * files.el (basic-save-buffer-2): Choose coding system for

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-01-30 09:16:16 +0000
+++ b/lisp/net/tramp-sh.el      2013-01-31 08:33:03 +0000
@@ -4272,7 +4272,7 @@
            (setq choices tramp-default-proxies-alist)))))
 
     ;; Handle gateways.
-    (when (and tramp-gw-tunnel-method tramp-gw-socks-method
+    (when (and (boundp 'tramp-gw-tunnel-method) (boundp 'tramp-gw-socks-method)
               (string-match
                (format
                 "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method)

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-01-30 09:16:16 +0000
+++ b/lisp/net/tramp.el 2013-01-31 08:33:03 +0000
@@ -1158,7 +1158,7 @@
 It checks also, whether NAME is unibyte encoded."
   (save-match-data
     (and (stringp name)
-        (string-equal name (string-as-unibyte name))
+;       (string-equal name (string-as-unibyte name))
         (string-match tramp-file-name-regexp name))))
 
 (defun tramp-find-method (method user host)