From 08bdb9d3a2f96319055099f42fed96d3bb3271a7 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 6 Oct 2021 11:15:16 -0500 Subject: Fix eshell... I think Eshell's loading order is so confusing --- eshell.el | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'eshell.el') diff --git a/eshell.el b/eshell.el index 05f90bc..c6078c2 100644 --- a/eshell.el +++ b/eshell.el @@ -3,20 +3,6 @@ ;; Copyright (C) 2021 Case Duckworth ;; Author: Case Duckworth <(rot13-string "npqj@npqj.arg")> -;; Keywords: - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . ;;; Commentary: @@ -26,6 +12,8 @@ ;;; Code: (require 'setup) +(require 'eshell) +(require 'em-alias) ;;; Environment (setenv "PAGER" "cat") @@ -52,8 +40,8 @@ (setup (:straight eshell-syntax-highlighting) (eshell-syntax-highlighting-global-mode +1)) -(setup (:straight-if fish-completion - (executable-find "fish")) +(setup (:straight-when fish-completion + (executable-find "fish")) (:autoload global-fish-completion-mode) (global-fish-completion-mode +1)) @@ -63,8 +51,5 @@ (when (boundp 'simple-modeline--mode-line) (setq mode-line-format '(:eval simple-modeline--mode-line))) -;;; Tell Emacs our customizations are loaded. -(defvar eshell-customizations-loaded t - "Whether eshell's customizations have been loaded yet.") - +(provide 'eshellrc) ;;; eshell.el ends here -- cgit 1.4.1-21-gabe81