diff options
| author | Michael Albinus | 2011-10-18 11:58:06 +0200 |
|---|---|---|
| committer | Michael Albinus | 2011-10-18 11:58:06 +0200 |
| commit | 6a80b297a14917970c185abc180bfc027b78d64b (patch) | |
| tree | fe1dd51a69a3ee7e99d1e5c81d5b2ab1faae16e0 | |
| parent | 28ef7b42852ffb54804999219f12ab33454f64cb (diff) | |
| download | emacs-6a80b297a14917970c185abc180bfc027b78d64b.tar.gz emacs-6a80b297a14917970c185abc180bfc027b78d64b.zip | |
* net/tramp.el (tramp-file-name-handler): Load Tramp packages silently.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f03894e728..b654be96e3f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-18 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently. | ||
| 4 | |||
| 1 | 2011-10-18 Jirka Kosek <jirka@kosek.cz> (tiny change) | 5 | 2011-10-18 Jirka Kosek <jirka@kosek.cz> (tiny change) |
| 2 | 6 | ||
| 3 | * international/mule.el (sgml-html-meta-auto-coding-function): | 7 | * international/mule.el (sgml-html-meta-auto-coding-function): |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index adc66f6766c..cc4fda32dff 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -1886,7 +1886,7 @@ Falls back to normal file name handler if no Tramp file name handler exists." | |||
| 1886 | (when (and (listp sf) (eq (car sf) 'autoload)) | 1886 | (when (and (listp sf) (eq (car sf) 'autoload)) |
| 1887 | (let ((default-directory | 1887 | (let ((default-directory |
| 1888 | (tramp-compat-temporary-file-directory))) | 1888 | (tramp-compat-temporary-file-directory))) |
| 1889 | (load (cadr sf) 'noerror))) | 1889 | (load (cadr sf) 'noerror 'nomessage))) |
| 1890 | (apply foreign operation args)) | 1890 | (apply foreign operation args)) |
| 1891 | 1891 | ||
| 1892 | ;; Trace that somebody has interrupted the operation. | 1892 | ;; Trace that somebody has interrupted the operation. |