Reordered tramp config.

This commit is contained in:
tastytea 2019-04-30 13:38:56 +02:00
parent bbf4899260
commit d7948b44d5
2 changed files with 7 additions and 10 deletions

15
init.el
View File

@ -1,5 +1,5 @@
;;; init.el --- tastytea's Emacs init file. ;;; 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: ;;; Commentary:
;; I am using this file with Emacs 26, but most of it will probably work with ;; 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. ;; Edit remote files.
(unless slow-computer (unless slow-computer
(use-package tramp (use-package tramp
:config :custom
;; ssh is faster than scp and supports ports. (tramp-use-ssh-controlmaster-options nil) ; Don't override SSH config.
(setq tramp-default-method "ssh") (tramp-default-method "ssh") ; ssh is faster than scp and supports ports.
;; Add verification code support. (tramp-password-prompt-regexp ; Add verification code support.
(customize-set-variable
'tramp-password-prompt-regexp
(concat (concat
"^.*" "^.*"
(regexp-opt (regexp-opt
@ -887,6 +885,7 @@ With argument, do this that many times."
"Verification code") "Verification code")
t) t)
".*:\0? *")) ".*:\0? *"))
:config
;; Respect remote PATH. ;; Respect remote PATH.
(add-to-list 'tramp-remote-path 'tramp-own-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-port 51313
server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server. server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server.
"phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh") "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh")
:custom
(tramp-use-ssh-controlmaster-options nil) ; Don't override SSH config.
:config :config
(unless (server-running-p) (unless (server-running-p)
(server-start)) (server-start))

View File

@ -1,2 +1,2 @@
127.0.0.1:51313 19206 127.0.0.1:51313 30434
phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh