emacs/plexus.chemacs2
1
0
Fork 0
mirror of https://github.com/plexus/chemacs2.git synced 2026-09-10 07:26:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a chemacs-early-init var

Browse source 
This way people could still symlink .emacs -> chemacs.el, if they don't have a
need for early-init support.
This commit is contained in:
Arne Brasseur 2020-10-01 11:17:18 +02:00
parent f723227a04
commit 78df5e469c
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chemacs-common.el → chemacs.el
View file

@ -16,7 +16,7 @@
;; ;;
;; :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ;; ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
;; ;;
;; Chemacs - Emacs Profile Switcher v0.1 ;; Chemacs - Emacs Profile Switcher
;; ;;
;; INSTALLATION ;; INSTALLATION
;; ;;
@ -91,7 +91,7 @@
(alist-get key (chemacs-get-emacs-profile chemacs-current-emacs-profile) (alist-get key (chemacs-get-emacs-profile chemacs-current-emacs-profile)
default)) default))
(defun chemacs-load-profile (profile early-init-p) (defun chemacs-load-profile (profile)
(when (not (chemacs-get-emacs-profile profile)) (when (not (chemacs-get-emacs-profile profile))
(error "No profile `%s' in %s" profile chemacs-profiles-path)) (error "No profile `%s' in %s" profile chemacs-profiles-path))
(setq chemacs-current-emacs-profile profile) (setq chemacs-current-emacs-profile profile)
@ -100,8 +100,7 @@
(init-file (expand-file-name "init.el" emacs-directory)) (init-file (expand-file-name "init.el" emacs-directory))
(custom-file- (chemacs-emacs-profile-key 'custom-file init-file)) (custom-file- (chemacs-emacs-profile-key 'custom-file init-file))
(server-name- (chemacs-emacs-profile-key 'server-name)) (server-name- (chemacs-emacs-profile-key 'server-name))
(early-init-file (expand-file-name "early-init.el" emacs-directory)) (early-init-file (expand-file-name "early-init.el" emacs-directory)))
)
(setq user-emacs-directory emacs-directory) (setq user-emacs-directory emacs-directory)
;; Allow multiple profiles to each run their server ;; Allow multiple profiles to each run their server
@ -114,9 +113,10 @@
(setenv (car env) (cdr env))) (setenv (car env) (cdr env)))
(chemacs-emacs-profile-key 'env)) (chemacs-emacs-profile-key 'env))
(if early-init-p (if (and (boundp 'chemacs-early-init) chemacs-early-init)
(when (file-exists-p early-init-file) (when (file-exists-p early-init-file)
(load early-init-file)) (load early-init-file)
(setq chemacs-early-init nil))
(when (chemacs-emacs-profile-key 'straight-p) (when (chemacs-emacs-profile-key 'straight-p)
(chemacs-load-straight)) (chemacs-load-straight))
@ -130,7 +130,7 @@
(unless (equal custom-file init-file) (unless (equal custom-file init-file)
(load custom-file)))))) (load custom-file))))))
(defun chemacs-check-command-line-args (args early-init-p) (defun chemacs-check-command-line-args (args)
(if args (if args
;; Handle either `--with-profile profilename' or ;; Handle either `--with-profile profilename' or
;; `--with-profile=profilename' ;; `--with-profile=profilename'
@ -144,14 +144,16 @@
'("--with-profile" . '("--with-profile" .
(lambda (_) (pop command-line-args-left)))) (lambda (_) (pop command-line-args-left))))
;; Load the profile ;; Load the profile
(chemacs-load-profile (cadr args) early-init-p)) (chemacs-load-profile (cadr args)))
;; Similar handling for `--with-profile=profilename' ;; Similar handling for `--with-profile=profilename'
((equal (car s) "--with-profile") ((equal (car s) "--with-profile")
(add-to-list 'command-switch-alist `(,(car args) . (lambda (_)))) (add-to-list 'command-switch-alist `(,(car args) . (lambda (_))))
(chemacs-load-profile (mapconcat 'identity (cdr s) "=") early-init-p)) (chemacs-load-profile (mapconcat 'identity (cdr s) "=")))
(t (chemacs-check-command-line-args (cdr args) early-init-p)))) (t (chemacs-check-command-line-args (cdr args)))))
;; If no profile given, load the "default" profile ;; If no profile given, load the "default" profile
(chemacs-load-profile (chemacs-detect-default-profile) early-init-p))) (chemacs-load-profile (chemacs-detect-default-profile))))
(chemacs-check-command-line-args command-line-args)

5
early-init.el
View file

@ -2,8 +2,9 @@
(let ((chemacs-directory (let ((chemacs-directory
(file-name-directory (file-truename load-file-name)))) (file-name-directory (file-truename load-file-name))))
(load (expand-file-name "chemacs-common.el" chemacs-directory))) (load (expand-file-name "chemacs.el" chemacs-directory)))
;; Check for a --with-profile flag and honor it; otherwise load the ;; Check for a --with-profile flag and honor it; otherwise load the
;; default profile. ;; default profile.
(chemacs-check-command-line-args command-line-args 'early-init) (defvar chemacs-early-init t)
(chemacs-check-command-line-args command-line-args)

4
init.el
View file

@ -2,8 +2,8 @@
(let ((chemacs-directory (let ((chemacs-directory
(file-name-directory (file-truename load-file-name)))) (file-name-directory (file-truename load-file-name))))
(load (expand-file-name "chemacs-common.el" chemacs-directory))) (load (expand-file-name "chemacs.el" chemacs-directory)))
;; Check for a --with-profile flag and honor it; otherwise load the ;; Check for a --with-profile flag and honor it; otherwise load the
;; default profile. ;; default profile.
(chemacs-check-command-line-args command-line-args nil) (chemacs-check-command-line-args command-line-args)