summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-10-06 11:15:16 -0500
committerCase Duckworth2021-10-06 11:15:46 -0500
commit08bdb9d3a2f96319055099f42fed96d3bb3271a7 (patch)
treead6c1d7294f1f6df37676e5d275ed6b795ac2257
parentReplace ytel with ytdious (diff)
downloademacs-08bdb9d3a2f96319055099f42fed96d3bb3271a7.tar.gz
emacs-08bdb9d3a2f96319055099f42fed96d3bb3271a7.zip
Fix eshell... I think
Eshell's loading order is so confusing
-rw-r--r--eshell.el25
-rw-r--r--init.el6
2 files changed, 7 insertions, 24 deletions
diff --git a/eshell.el b/eshell.el index 05f90bc..c6078c2 100644 --- a/eshell.el +++ b/eshell.el
@@ -3,20 +3,6 @@
3;; Copyright (C) 2021 Case Duckworth 3;; Copyright (C) 2021 Case Duckworth
4 4
5;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> 5;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")>
6;; Keywords:
7
8;; This program is free software; you can redistribute it and/or modify
9;; it under the terms of the GNU General Public License as published by
10;; the Free Software Foundation, either version 3 of the License, or
11;; (at your option) any later version.
12
13;; This program is distributed in the hope that it will be useful,
14;; but WITHOUT ANY WARRANTY; without even the implied warranty of
15;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16;; GNU General Public License for more details.
17
18;; You should have received a copy of the GNU General Public License
19;; along with this program. If not, see <https://www.gnu.org/licenses/>.
20 6
21;;; Commentary: 7;;; Commentary:
22 8
@@ -26,6 +12,8 @@
26;;; Code: 12;;; Code:
27 13
28(require 'setup) 14(require 'setup)
15(require 'eshell)
16(require 'em-alias)
29 17
30;;; Environment 18;;; Environment
31(setenv "PAGER" "cat") 19(setenv "PAGER" "cat")
@@ -52,8 +40,8 @@
52(setup (:straight eshell-syntax-highlighting) 40(setup (:straight eshell-syntax-highlighting)
53 (eshell-syntax-highlighting-global-mode +1)) 41 (eshell-syntax-highlighting-global-mode +1))
54 42
55(setup (:straight-if fish-completion 43(setup (:straight-when fish-completion
56 (executable-find "fish")) 44 (executable-find "fish"))
57 (:autoload global-fish-completion-mode) 45 (:autoload global-fish-completion-mode)
58 (global-fish-completion-mode +1)) 46 (global-fish-completion-mode +1))
59 47
@@ -63,8 +51,5 @@
63(when (boundp 'simple-modeline--mode-line) 51(when (boundp 'simple-modeline--mode-line)
64 (setq mode-line-format '(:eval simple-modeline--mode-line))) 52 (setq mode-line-format '(:eval simple-modeline--mode-line)))
65 53
66;;; Tell Emacs our customizations are loaded. 54(provide 'eshellrc)
67(defvar eshell-customizations-loaded t
68 "Whether eshell's customizations have been loaded yet.")
69
70;;; eshell.el ends here 55;;; eshell.el ends here
diff --git a/init.el b/init.el index 4ad55a9..a1536c5 100644 --- a/init.el +++ b/init.el
@@ -446,12 +446,10 @@
446 (:local-set outline-regexp eshell-prompt-regexp 446 (:local-set outline-regexp eshell-prompt-regexp
447 page-delimiter eshell-prompt-regexp) 447 page-delimiter eshell-prompt-regexp)
448 448
449 (:bind "C-d" #'eshell-quit-or-delete-char)
450
451 (:hook #'eshell-arg-hist-mode 449 (:hook #'eshell-arg-hist-mode
452 (defun eshell-mode@setup () 450 (defun eshell-mode@setup ()
453 (unless (bound-and-true-p eshell-customizations-loaded) 451 (require 'eshellrc (locate-user-emacs-file "eshell") :noerror)
454 (load (expand-file-name "eshell" user-emacs-directory)))))) 452 (:bind "C-d" #'eshell-quit-or-delete-char))))
455 453
456(setup eww 454(setup eww
457 (:also-load acdw-eww) 455 (:also-load acdw-eww)