diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:26 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:26 +0200 |
commit | 79a03641d58f351454051bf2320e94508525a41b (patch) | |
tree | 8fa1b8870eb83ffb282848d8cf1363e542fd126d /pkgs/applications/editors/emacs | |
parent | 7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288 (diff) | |
parent | 74c24385cb2864f937031df74af14fc8060e1540 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors/emacs')
-rw-r--r-- | pkgs/applications/editors/emacs/site-start.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 34addc33a59c..de4708b88908 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -1,6 +1,7 @@ +;; -*- lexical-binding: t; -*- (defun nix--profile-paths () - "Returns a list of all paths in the NIX_PROFILES environment -variable, ordered from more-specific (the user profile) to the + "Return a list of all paths in NIX_PROFILES. +The list is ordered from more-specific (the user profile) to the least specific (the system profile)" (reverse (split-string (or (getenv "NIX_PROFILES") "")))) @@ -23,6 +24,7 @@ least specific (the system profile)" ;;; Make `woman' find the man pages +(defvar woman-manpath) (eval-after-load 'woman '(setq woman-manpath (append (mapcar (lambda (x) (concat x "/share/man/")) @@ -30,6 +32,7 @@ least specific (the system profile)" woman-manpath))) ;;; Make tramp work for remote NixOS machines +(defvar tramp-remote-path) (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 @@ -42,6 +45,7 @@ least specific (the system profile)" ;;; the current file: ;;; from: /nix/store/<hash>-emacs-<version>/share/emacs/site-lisp/site-start.el ;;; to: /nix/store/<hash>-emacs-<version>/share/emacs/<version>/src/ +(defvar find-function-C-source-directory) (let ((emacs (file-name-directory ; .../emacs/ (directory-file-name ; .../emacs/site-lisp |