From f18002d662e264f952f6fb29f41214968a38beed Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 28 Feb 2019 21:23:44 -0800 Subject: Remove reference to init/ everything has been moved to emacs-config --- emacs/.emacs.d/GNUmakefile | 5 +---- emacs/.emacs.d/init.el | 1 - emacs/.emacs.d/windows.mk | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/emacs/.emacs.d/GNUmakefile b/emacs/.emacs.d/GNUmakefile index 604bb52..738090d 100644 --- a/emacs/.emacs.d/GNUmakefile +++ b/emacs/.emacs.d/GNUmakefile @@ -7,14 +7,11 @@ AUTOLOADS_FILE := site-lisp/oni-site-autoloads.el UNWANTED := $(AUTOLOADS_FILE) site-lisp/flycheck_% site-lisp/flycheck-% SITE_LISPS := $(filter-out $(UNWANTED),$(wildcard site-lisp/*.el)) COMPILED_SITE_LISPS := $(addsuffix c,$(SITE_LISPS)) -INIT_LISPS := $(wildcard init/*.el) -COMPILED_INIT_LISPS := $(addsuffix c,$(INIT_LISPS)) VENDOR_DIRS := $(wildcard vendor-lisp/*) BASE_DIR := $(CURDIR) .PHONY: all snippets -all: $(COMPILED_SITE_LISPS) init.elc $(COMPILED_INIT_LISPS) \ - $(AUTOLOADS_FILE) snippets +all: $(COMPILED_SITE_LISPS) init.elc $(AUTOLOADS_FILE) snippets %.elc: %.el @echo -e "\e[31mELC\e[0m $<" diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index b7d0da1..34d5853 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -31,7 +31,6 @@ (let ((load-directory (file-name-directory (or load-file-name byte-compile-current-file)))) - (add-to-list 'load-path (format "%sinit/" load-directory)) (add-to-list 'load-path (format "%ssite-lisp/" load-directory)) (add-to-list 'load-path (format "%sos-lisp/" load-directory)) diff --git a/emacs/.emacs.d/windows.mk b/emacs/.emacs.d/windows.mk index 45b2bd1..93a27c2 100755 --- a/emacs/.emacs.d/windows.mk +++ b/emacs/.emacs.d/windows.mk @@ -9,7 +9,7 @@ SITE_LISPS := $(SITE_LISPS) os-lisp/oni-windows-nt.el COMPILED_SITE_LISPS := $(COMPILED_SITE_LISPS) os-lisp/oni-windows-nt.elc ALL_LISPS := init.el init.elc $(SITE_LISPS) $(COMPILED_SITE_LISPS) \ - $(INIT_LISPS) $(COMPILED_INIT_LISPS) $(AUTOLOADS_FILE) + $(AUTOLOADS_FILE) install: for file in $(ALL_LISPS); do \ -- cgit v1.2.3-54-g00ecf