Merge branch 'master' into drone/lua-mode

This commit is contained in:
Jonas Bernoulli
2020-09-08 12:37:07 +02:00
4 changed files with 7 additions and 3 deletions

View File

@@ -162,6 +162,10 @@
vc-ignore-dir-regexp vc-ignore-dir-regexp
tramp-file-name-regexp))) tramp-file-name-regexp)))
(use-package tramp-sh
:defer t
:config (cl-pushnew 'tramp-own-remote-path tramp-remote-path))
(progn ; startup (progn ; startup
(message "Loading %s...done (%.3fs)" user-init-file (message "Loading %s...done (%.3fs)" user-init-file
(float-time (time-subtract (current-time) (float-time (time-subtract (current-time)