[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Michael Albinus]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/10/10 04:55:30

Index: lisp/net/tramp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- lisp/net/tramp.el   8 Oct 2007 20:07:16 -0000       1.145
+++ lisp/net/tramp.el   10 Oct 2007 04:55:30 -0000      1.146
@@ -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