diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index def47702a73..e0eb300c191 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-03-13 Michael Albinus <michael.albinus@gmx.de> + + * 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 <monnier@iro.umontreal.ca> * 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) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e429d176a6e..d20fd6b1067 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2568,7 +2568,9 @@ This is like `dired-recursive-delete-directory' for Tramp files." ;; 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)) |