diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
commit | 911d1853ca990a7af6725105e7cda8c24cac025f (patch) | |
tree | 61aac8cb7c86d87fa2cdffe4b01e721e5e6fff64 /pkgs/applications/editors/emacs/site-start.el | |
parent | 826ab7026e0f18c85fb861ae5f97bad1e9f37006 (diff) | |
parent | b9307eddd67e0e3f087dec608ccc84fec72deda5 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors/emacs/site-start.el')
-rw-r--r-- | pkgs/applications/editors/emacs/site-start.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index cc1ab1d0e3039..34addc33a59c1 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -30,7 +30,7 @@ least specific (the system profile)" woman-manpath))) ;;; Make tramp work for remote NixOS machines -(eval-after-load 'tramp +(eval-after-load 'tramp-sh ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover ;; them dynamically after connecting via `tramp' |