From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 23 Oct 2016 11:28:33 +0000 (+0200)
Subject: ; Apply whitespace conventions of Tramp upstream
X-Git-Tag: emacs-26.0.90~1444
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ca70e402ecab5d7e71e418af6866c8b02d4f757;p=emacs.git

; Apply whitespace conventions of Tramp upstream
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e9077194691..0e21a81f527 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4092,32 +4092,32 @@ process to set up.  VEC specifies the connection."
     ;; CCC this can't be the right way to do it.  Hm.
     (tramp-message vec 5 "Determining coding system")
     (with-current-buffer (process-buffer proc)
-      ;; Use MULE to select the right EOL convention for
-      ;; communicating with the process.
+      ;; Use MULE to select the right EOL convention for communicating
+      ;; with the process.
       (let ((cs (or (and (memq 'utf-8 (coding-system-list))
-                         (string-match "utf-?8" (tramp-get-remote-locale vec))
-                         (cons 'utf-8 'utf-8))
-                    (process-coding-system proc)
-                    (cons 'undecided 'undecided)))
-            cs-decode cs-encode)
-        (when (symbolp cs) (setq cs (cons cs cs)))
-        (setq cs-decode (or (car cs) 'undecided)
-              cs-encode (or (cdr cs) 'undecided)
-              cs-encode
-              (coding-system-change-eol-conversion
-               cs-encode (if (string-match "^Darwin" uname) 'mac 'unix)))
-        (tramp-send-command vec "echo foo ; echo bar" t)
-        (goto-char (point-min))
-        (when (search-forward "\r" nil t)
-          (setq cs-decode (coding-system-change-eol-conversion cs-decode 'dos)))
-        ;; Special setting for Mac OS X.
-        (when (and (string-match "^Darwin" uname)
-                   (memq 'utf-8-hfs (coding-system-list)))
-          (setq cs-decode 'utf-8-hfs
-                cs-encode 'utf-8-hfs))
-        (set-buffer-process-coding-system cs-decode cs-encode)
-        (tramp-message
-         vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
+			 (string-match "utf-?8" (tramp-get-remote-locale vec))
+			 (cons 'utf-8 'utf-8))
+		    (process-coding-system proc)
+		    (cons 'undecided 'undecided)))
+	    cs-decode cs-encode)
+	(when (symbolp cs) (setq cs (cons cs cs)))
+	(setq cs-decode (or (car cs) 'undecided)
+	      cs-encode (or (cdr cs) 'undecided)
+	      cs-encode
+	      (coding-system-change-eol-conversion
+	       cs-encode (if (string-match "^Darwin" uname) 'mac 'unix)))
+	(tramp-send-command vec "echo foo ; echo bar" t)
+	(goto-char (point-min))
+	(when (search-forward "\r" nil t)
+	  (setq cs-decode (coding-system-change-eol-conversion cs-decode 'dos)))
+	;; Special setting for Mac OS X.
+	(when (and (string-match "^Darwin" uname)
+		   (memq 'utf-8-hfs (coding-system-list)))
+	  (setq cs-decode 'utf-8-hfs
+		cs-encode 'utf-8-hfs))
+	(set-buffer-process-coding-system cs-decode cs-encode)
+	(tramp-message
+	 vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
 
     (tramp-send-command vec "set +o vi +o emacs" t)
 
@@ -4172,7 +4172,7 @@ process to set up.  VEC specifies the connection."
     ;; Set `remote-tty' process property.
     (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"" 'noerror)))
       (unless (zerop (length tty))
-        (process-put proc 'remote-tty tty)))
+	(process-put proc 'remote-tty tty)))
 
     ;; Dump stty settings in the traces.
     (when (>= tramp-verbose 9)
@@ -4183,13 +4183,13 @@ process to set up.  VEC specifies the connection."
 
     (let (unset vars)
       (dolist (item (reverse
-                     (append `(,(tramp-get-remote-locale vec))
-                             (copy-sequence tramp-remote-process-environment))))
-        (setq item (split-string item "=" 'omit))
-        (setcdr item (mapconcat 'identity (cdr item) "="))
-        (if (and (stringp (cdr item)) (not (string-equal (cdr item) "")))
-            (push (format "%s %s" (car item) (cdr item)) vars)
-          (push (car item) unset)))
+		     (append `(,(tramp-get-remote-locale vec))
+			     (copy-sequence tramp-remote-process-environment))))
+	(setq item (split-string item "=" 'omit))
+	(setcdr item (mapconcat 'identity (cdr item) "="))
+	(if (and (stringp (cdr item)) (not (string-equal (cdr item) "")))
+	    (push (format "%s %s" (car item) (cdr item)) vars)
+	  (push (car item) unset)))
       (when vars
 	(tramp-send-command
 	 vec