diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-15 02:05:20 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-15 02:05:20 +0000 |
| commit | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (patch) | |
| tree | 34fc72789f1cfbfeb067cf507f8871c322df300a /lisp/net/rcompile.el | |
| parent | 76d11d2cf9623e9f4c38e8239c4444ffc1fae485 (diff) | |
| parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
| download | emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.gz emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.bz2 emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-813)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
Diffstat (limited to 'lisp/net/rcompile.el')
| -rw-r--r-- | lisp/net/rcompile.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el index c262a129adc..9eecb8e4481 100644 --- a/lisp/net/rcompile.el +++ b/lisp/net/rcompile.el @@ -188,8 +188,7 @@ See \\[compile]." (when (featurep 'tramp) (set (make-local-variable 'comint-file-name-prefix) (funcall (symbol-function 'tramp-make-tramp-file-name) - nil ;; multi-method. To be removed with Tramp 2.1. - nil + nil ;; method. remote-compile-user remote-compile-host "")))))) |