[Emacs-diffs] /srv/bzr/emacs/trunk r112034: * net/tramp-sh.el (tramp-sh-handle-insert-directory): Check,

[Michael Albinus]

------------------------------------------------------------
revno: 112034
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Wed 2013-03-13 12:38:13 +0100
message:
  * net/tramp-sh.el (tramp-sh-handle-insert-directory): Check,
  whether `default-file-name-coding-system' is bound.  It isn't in
  XEmacs.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-13 02:19:31 +0000
+++ b/lisp/ChangeLog    2013-03-13 11:38:13 +0000
@@ -1,3 +1,9 @@
+2013-03-13  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-sh-handle-insert-directory): Check,
+       whether `default-file-name-coding-system' is bound.  It isn't in
+       XEmacs.
+
 2013-03-13  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/byte-run.el (defun-declarations-alist): Don't use
@@ -195,14 +201,13 @@
        (tramp-gvfs-mount-spec): Use it.
        (tramp-gvfs-maybe-open-connection): Check, that in case of "smb"
        there is a share name.  Handle different names of the D-Bus
-       signals and methods.
-       (tramp-gvfs-maybe-open-connection): Set connection properties
-       needed for `tramp-check-cached-permissions'.
+       signals and methods.  Set connection properties needed for
+       `tramp-check-cached-permissions'.
        (tramp-gvfs-send-command): Apply `tramp-gvfs-maybe-open-connection'.
        Return t or nil.
 
        * net/tramp.el (tramp-backtrace): Move up.
-       (tramp-error): Apply a backtrace into the debug buffer when
+       (tramp-error): Dump a backtrace into the debug buffer when
        `tramp-verbose > 9.
        (tramp-file-mode-type-map, tramp-file-mode-from-int)
        (tramp-file-mode-permissions, tramp-get-local-uid)

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-03-09 11:06:23 +0000
+++ b/lisp/net/tramp-sh.el      2013-03-13 11:38:13 +0000
@@ -2568,7 +2568,9 @@
        ;; Decode the output, it could be multibyte.
        (decode-coding-region
         beg (point-max)
-        (or file-name-coding-system default-file-name-coding-system))
+        (or file-name-coding-system
+            (and (boundp 'default-file-name-coding-system)
+                 (symbolp 'default-file-name-coding-system))))
 
        ;; The inserted file could be from somewhere else.
        (when (and (not wildcard) (not full-directory-p))