From 30fabc8c5cbf43aac56fa5adca3c37492a847bc5 Mon Sep 17 00:00:00 2001 From: Ambrevar Date: Wed, 9 Jan 2013 11:55:55 +0100 Subject: [PATCH] Emacs: now Emacs daemon uses .emacs-full loading everything, whereas Emacs uses .emacs which discard plugins.el. --- .emacs | 4 ++-- .emacs-full | 16 ++++++++++++++++ .shell.d/alias_rc | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .emacs-full diff --git a/.emacs b/.emacs index cf8ae57b..c7f10105 100644 --- a/.emacs +++ b/.emacs @@ -1,6 +1,7 @@ +;; -*- mode:emacs-lisp -*- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Emacs config -;; 2012-10-12 +;; 2013-01-09 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Main should be loaded first. @@ -9,7 +10,6 @@ (load "~/.emacs.d/theme.el" nil t) (load "~/.emacs.d/modes.el" nil t) (load "~/.emacs.d/functions.el" nil t) -(load "~/.emacs.d/plugins.el" nil t) ;; End of file diff --git a/.emacs-full b/.emacs-full new file mode 100644 index 00000000..1f86acbb --- /dev/null +++ b/.emacs-full @@ -0,0 +1,16 @@ +;; -*- mode:emacs-lisp -*- +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Emacs config +;; 2013-01-09 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; Main should be loaded first. +(load "~/.emacs.d/main.el" nil t) + +(load "~/.emacs.d/theme.el" nil t) +(load "~/.emacs.d/modes.el" nil t) +(load "~/.emacs.d/functions.el" nil t) +(load "~/.emacs.d/plugins.el" nil t) + +;; End of file + diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc index 29d838e6..6a4b099b 100644 --- a/.shell.d/alias_rc +++ b/.shell.d/alias_rc @@ -111,7 +111,7 @@ alias xmorphzi='xrandr --output $(xrandr | grep "\" | cut -f1 -d" ") # WantedBy=multi-user.target if [ -n "$(command -v emacs)" ]; then alias em='emacsclient -a "" -t' - alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; emacs --daemon" + alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; emacs --daemon -q -l ~/.emacs-full" # alias emacs-reload="sudo systemctl restart emacs@$USER" fi