From d7948b44d5b7cf0e38dcf4a2fa5c7c9b951ecf06 Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 30 Apr 2019 13:38:56 +0200 Subject: [PATCH] Reordered tramp config. --- init.el | 15 ++++++--------- server/server | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/init.el b/init.el index 517b6e4..cffafc6 100644 --- a/init.el +++ b/init.el @@ -1,5 +1,5 @@ ;;; init.el --- tastytea's Emacs init file. -;; Time-stamp: <2019-04-29T16:39:53+00:00> +;; Time-stamp: <2019-04-30T11:35:32+00:00> ;;; Commentary: ;; I am using this file with Emacs 26, but most of it will probably work with @@ -873,12 +873,10 @@ With argument, do this that many times." ;; Edit remote files. (unless slow-computer (use-package tramp - :config - ;; ssh is faster than scp and supports ports. - (setq tramp-default-method "ssh") - ;; Add verification code support. - (customize-set-variable - 'tramp-password-prompt-regexp + :custom + (tramp-use-ssh-controlmaster-options nil) ; Don't override SSH config. + (tramp-default-method "ssh") ; ssh is faster than scp and supports ports. + (tramp-password-prompt-regexp ; Add verification code support. (concat "^.*" (regexp-opt @@ -887,6 +885,7 @@ With argument, do this that many times." "Verification code") t) ".*:\0? *")) + :config ;; Respect remote PATH. (add-to-list 'tramp-remote-path 'tramp-own-remote-path))) @@ -903,8 +902,6 @@ With argument, do this that many times." server-port 51313 server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server. "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh") - :custom - (tramp-use-ssh-controlmaster-options nil) ; Don't override SSH config. :config (unless (server-running-p) (server-start)) diff --git a/server/server b/server/server index 6378999..f966956 100644 --- a/server/server +++ b/server/server @@ -1,2 +1,2 @@ -127.0.0.1:51313 19206 +127.0.0.1:51313 30434 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh \ No newline at end of file