diff options
| author | Michael Albinus | 2013-03-13 12:38:13 +0100 |
|---|---|---|
| committer | Michael Albinus | 2013-03-13 12:38:13 +0100 |
| commit | 85b66a2100227c5bb0eb51f56cd3b6d919288b1c (patch) | |
| tree | 9b63305d6e29e4e47bec3ae34043b15d39571aec | |
| parent | 2393bc7411d41d1b5f0b0c7cfb6de25d7e80e66d (diff) | |
| download | emacs-85b66a2100227c5bb0eb51f56cd3b6d919288b1c.tar.gz emacs-85b66a2100227c5bb0eb51f56cd3b6d919288b1c.zip | |
* net/tramp-sh.el (tramp-sh-handle-insert-directory): Check,
whether `default-file-name-coding-system' is bound. It isn't in
XEmacs.
| -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 @@ | |||
| 1 | 2013-03-13 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-sh-handle-insert-directory): Check, | ||
| 4 | whether `default-file-name-coding-system' is bound. It isn't in | ||
| 5 | XEmacs. | ||
| 6 | |||
| 1 | 2013-03-13 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2013-03-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * emacs-lisp/byte-run.el (defun-declarations-alist): Don't use | 9 | * emacs-lisp/byte-run.el (defun-declarations-alist): Don't use |
| @@ -195,14 +201,13 @@ | |||
| 195 | (tramp-gvfs-mount-spec): Use it. | 201 | (tramp-gvfs-mount-spec): Use it. |
| 196 | (tramp-gvfs-maybe-open-connection): Check, that in case of "smb" | 202 | (tramp-gvfs-maybe-open-connection): Check, that in case of "smb" |
| 197 | there is a share name. Handle different names of the D-Bus | 203 | there is a share name. Handle different names of the D-Bus |
| 198 | signals and methods. | 204 | signals and methods. Set connection properties needed for |
| 199 | (tramp-gvfs-maybe-open-connection): Set connection properties | 205 | `tramp-check-cached-permissions'. |
| 200 | needed for `tramp-check-cached-permissions'. | ||
| 201 | (tramp-gvfs-send-command): Apply `tramp-gvfs-maybe-open-connection'. | 206 | (tramp-gvfs-send-command): Apply `tramp-gvfs-maybe-open-connection'. |
| 202 | Return t or nil. | 207 | Return t or nil. |
| 203 | 208 | ||
| 204 | * net/tramp.el (tramp-backtrace): Move up. | 209 | * net/tramp.el (tramp-backtrace): Move up. |
| 205 | (tramp-error): Apply a backtrace into the debug buffer when | 210 | (tramp-error): Dump a backtrace into the debug buffer when |
| 206 | `tramp-verbose > 9. | 211 | `tramp-verbose > 9. |
| 207 | (tramp-file-mode-type-map, tramp-file-mode-from-int) | 212 | (tramp-file-mode-type-map, tramp-file-mode-from-int) |
| 208 | (tramp-file-mode-permissions, tramp-get-local-uid) | 213 | (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." | |||
| 2568 | ;; Decode the output, it could be multibyte. | 2568 | ;; Decode the output, it could be multibyte. |
| 2569 | (decode-coding-region | 2569 | (decode-coding-region |
| 2570 | beg (point-max) | 2570 | beg (point-max) |
| 2571 | (or file-name-coding-system default-file-name-coding-system)) | 2571 | (or file-name-coding-system |
| 2572 | (and (boundp 'default-file-name-coding-system) | ||
| 2573 | (symbolp 'default-file-name-coding-system)))) | ||
| 2572 | 2574 | ||
| 2573 | ;; The inserted file could be from somewhere else. | 2575 | ;; The inserted file could be from somewhere else. |
| 2574 | (when (and (not wildcard) (not full-directory-p)) | 2576 | (when (and (not wildcard) (not full-directory-p)) |