From 40913d728310e9380bf49e98d68207c5b8be6dfd Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 26 Feb 2019 01:45:01 -0800 Subject: [PATCH] Move Eshell configuration to emacs-config --- emacs/.emacs.d/init.el | 1 - emacs/.emacs.d/init/oni-eshell-init.el | 55 -------------------------- 2 files changed, 56 deletions(-) delete mode 100644 emacs/.emacs.d/init/oni-eshell-init.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 9136e58..f56a1b8 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -163,7 +163,6 @@ ;; 'face '(:family "Font Awesome" :height 0.75)))) (with-eval-after-load 'elec-pair (load "oni-elec-pair-init")) -(with-eval-after-load 'eshell (load "oni-eshell-init")) (with-eval-after-load 'gnus (load "oni-gnus-init")) (with-eval-after-load 'ruby-mode (load "oni-ruby-init")) (with-eval-after-load 'scheme (load "oni-scheme-init")) diff --git a/emacs/.emacs.d/init/oni-eshell-init.el b/emacs/.emacs.d/init/oni-eshell-init.el deleted file mode 100644 index 6dab317..0000000 --- a/emacs/.emacs.d/init/oni-eshell-init.el +++ /dev/null @@ -1,55 +0,0 @@ -;;; oni-eshell-init.el --- Eshell config -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: local - -;; 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: - -;; My Eshell configuration. - -;;; Code: - -(require 'eshell) -(require 'em-prompt) - -(defun oni-eshell-init-C-d () - "Call `delete-char' or close the buffer if it fails." - (interactive) - (condition-case err - (call-interactively #'delete-char) - (error (if (and (eq (car err) 'end-of-buffer) - (looking-back eshell-prompt-regexp nil)) - (kill-buffer) - (signal (car err) (cdr err)))))) - -(defun oni-eshell-init-enable-truncating-buffers () - "Add `eshell-truncate-buffer' to `eshell-output-filter-functions'." - (add-to-list 'eshell-output-filter-functions 'eshell-truncate-buffer)) - -(add-hook 'eshell-load-hook #'oni-eshell-init-enable-truncating-buffers) -(add-hook 'eshell-mode-hook 'eshell-fringe-status-mode) -(add-hook 'eshell-mode-hook 'goto-address-mode) - -(defun oni:set-eshell-C-d () - "Set `C-d' to quit eshell if used at end of prompt." - (define-key eshell-mode-map (kbd "C-d") #'oni-eshell-init-C-d)) - -(add-hook 'eshell-first-time-mode-hook #'oni:set-eshell-C-d) - -(provide 'oni-eshell-init) -;;; oni-eshell-init.el ends here