about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el1
-rw-r--r--.emacs.d/lisp/init-emacs-lisp.el2
-rw-r--r--.emacs.d/lisp/init-lisp.el16
-rw-r--r--.emacs.d/lisp/init-ui.el9
4 files changed, 9 insertions, 19 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 36528a6..74fcacf 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -42,7 +42,6 @@
 (require 'init-kill)
 (require 'init-dired)
 (require 'init-smartparens)
-(require 'init-lisp)
 (require 'init-emacs-lisp)
 (require 'init-clojure)
 (require 'init-paredit)
diff --git a/.emacs.d/lisp/init-emacs-lisp.el b/.emacs.d/lisp/init-emacs-lisp.el
index 1de66c0..b83e03c 100644
--- a/.emacs.d/lisp/init-emacs-lisp.el
+++ b/.emacs.d/lisp/init-emacs-lisp.el
@@ -3,8 +3,6 @@
 ;; Based on prelude-emacs-lisp.el
 ;;; Code:
 
-(require 'init-lisp)
-
 (use-feature eldoc
   :diminish)
 
diff --git a/.emacs.d/lisp/init-lisp.el b/.emacs.d/lisp/init-lisp.el
deleted file mode 100644
index dbc0a0d..0000000
--- a/.emacs.d/lisp/init-lisp.el
+++ /dev/null
@@ -1,16 +0,0 @@
-;;; init-lisp.el --- LISP Configuration File -*- lexical-binding: t -*-
-;;; Commentary:
-;;; Code:
-(require 'init-paredit)
-
-;; From https://github.com/jwiegley/dot-emacs/blob/master/init.el
-(use-package eval-expr
-  :bind ("M-:" . eval-expr)
-  :config
-  (defun eval-expr-minibuffer-setup ()
-    (local-set-key (kbd "<tab>") #'lisp-complete-symbol)
-    (set-syntax-table emacs-lisp-mode-syntax-table)
-    (paredit-mode)))
-
-(provide 'init-lisp)
-;;; init-lisp.el ends here
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index d8ba69d..9d22c1b 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -210,5 +210,14 @@
          ("C-h o" . helpful-symbol)
          ("C-h C-." . helpful-at-point)))
 
+;; From https://github.com/jwiegley/dot-emacs/blob/master/init.el
+(use-package eval-expr
+  :bind ("M-:" . eval-expr)
+  :config
+  (defun eval-expr-minibuffer-setup ()
+    (local-set-key (kbd "<tab>") #'lisp-complete-symbol)
+    (set-syntax-table emacs-lisp-mode-syntax-table)
+    (paredit-mode)))
+
 (provide 'init-ui)
 ;;; init-ui.el ends here