Mercurial > emacs

diff lisp/net/tramp.el @ 91048:d38543a1c0f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 880-885) - Remove RCS keywords from doc/misc/cc-mode.texi - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264
author Miles Bader <miles@gnu.org>
date Sat, 13 Oct 2007 05:53:03 +0000
parents bdb3fe0ba9fa 9a6e9b6e4a76
children 1251cabc40b7
line wrap: on
line diff
--- a/lisp/net/tramp.el	Fri Oct 12 21:57:45 2007 +0000
+++ b/lisp/net/tramp.el	Sat Oct 13 05:53:03 2007 +0000
@@ -5695,7 +5695,7 @@
     (if (featurep 'mule)
 	;; Use MULE to select the right EOL convention for communicating
 	;; with the process.
-	(let* ((cs (or (process-coding-system proc)
+	(let* ((cs (or (funcall (symbol-function 'process-coding-system) proc)
 		       (cons 'undecided 'undecided)))
 	       cs-decode cs-encode)
 	  (when (symbolp cs) (setq cs (cons cs cs)))
@@ -5708,7 +5708,8 @@
 	  (when (search-forward "\r" nil t)
 	    (setq cs-decode (tramp-coding-system-change-eol-conversion
 			     cs-decode 'dos)))
-	  (set-buffer-process-coding-system cs-decode cs-encode))
+	  (funcall (symbol-function 'set-buffer-process-coding-system)
+		   cs-decode cs-encode))
       ;; Look for ^M and do something useful if found.
       (when (search-forward "\r" nil t)
 	;; We have found a ^M but cannot frob the process coding system