diff options
| author | Michael Albinus | 2011-06-23 15:03:04 +0200 |
|---|---|---|
| committer | Michael Albinus | 2011-06-23 15:03:04 +0200 |
| commit | d59eb51849ca16fe39395cf83dd808cbff2adc2b (patch) | |
| tree | d1228239708d95aa837dba97089fe18c980e82f5 | |
| parent | 4fc2b746f7bc9c3b2b8456411c762f5073ca0914 (diff) | |
| download | emacs-d59eb51849ca16fe39395cf83dd808cbff2adc2b.tar.gz emacs-d59eb51849ca16fe39395cf83dd808cbff2adc2b.zip | |
* net/tramp-sh.el (tramp-method-out-of-band-p): Check, whether
SIZE is a number.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dfac3b497ad..8660bd5b764 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-06-23 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-method-out-of-band-p): Check, whether | ||
| 4 | SIZE is a number. | ||
| 5 | |||
| 1 | 2011-06-23 Martin Rudalics <rudalics@gmx.at> | 6 | 2011-06-23 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.el (get-lru-window, get-mru-window) | 8 | * window.el (get-lru-window, get-mru-window) |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 025b4ab6cf3..e340ddc6cb0 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -4661,6 +4661,8 @@ This is used internally by `tramp-file-mode-from-int'." | |||
| 4661 | (and | 4661 | (and |
| 4662 | ;; It shall be an out-of-band method. | 4662 | ;; It shall be an out-of-band method. |
| 4663 | (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program) | 4663 | (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program) |
| 4664 | ;; There must be a size, otherwise the file doesn't exist. | ||
| 4665 | (numberp size) | ||
| 4664 | ;; Either the file size is large enough, or (in rare cases) there | 4666 | ;; Either the file size is large enough, or (in rare cases) there |
| 4665 | ;; does not exist a remote encoding. | 4667 | ;; does not exist a remote encoding. |
| 4666 | (or (null tramp-copy-size-limit) | 4668 | (or (null tramp-copy-size-limit) |