From 23cd3185f768c68aed6d8035a72502e95587db1d Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 22 Dec 2018 23:27:30 -0500 Subject: [PATCH 1/1] [emacs] remove shell-toggle --- .gitmodules | 3 --- init.org | 48 +----------------------------------------------- lib/shell-toggle | 1 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 160000 lib/shell-toggle diff --git a/.gitmodules b/.gitmodules index 976da5d..f318c21 100644 --- a/.gitmodules +++ b/.gitmodules @@ -243,9 +243,6 @@ [submodule "s"] path = lib/s url = git@github.com:magnars/s.el.git -[submodule "shell-toggle"] - path = lib/shell-toggle - url = git@github.com:knu/shell-toggle.el.git [submodule "shrink-path"] path = lib/shrink-path url = git@gitlab.com:bennya/shrink-path.el.git diff --git a/init.org b/init.org index eea005d..31c7a86 100644 --- a/init.org +++ b/init.org @@ -946,6 +946,7 @@ There's no way I could top that, so I won't attempt to. (use-package eshell :defer 1 :commands eshell + :bind ("C-c a s e" . eshell) :config (eval-when-compile (defvar eshell-prompt-regexp)) (defun amin/eshell-quit-or-delete-char (arg) @@ -1714,53 +1715,6 @@ Emacs package that displays available keybindings in popup ("C-S-h p" . helpful-at-point))) #+end_src -** [[https://github.com/knu/shell-toggle.el][shell-toggle]] - -#+begin_src emacs-lisp -(use-package shell-toggle - :after eshell - :bind ("C-c a s e" . amin/shell-toggle) - :config - (defun amin/shell-toggle (make-cd) - "Toggle between the shell buffer and whatever buffer you are editing. -With a prefix argument MAKE-CD also insert a \"cd DIR\" command -into the shell, where DIR is the directory of the current buffer. - -When called in the shell buffer returns you to the buffer you were editing -before calling this the first time. - -Options: `shell-toggle-goto-eob'" - (interactive "P") - ;; Try to decide on one of three possibilities: - ;; If not in shell-buffer, switch to it. - ;; If in shell-buffer, return to state before going to the shell-buffer - (if (eq (current-buffer) shell-toggle-shell-buffer) - (shell-toggle-buffer-return-from-shell) - (progn - (shell-toggle-buffer-goto-shell make-cd) - (if shell-toggle-full-screen-window-only (delete-other-windows))))) - - ;; override to split horizontally instead - (defun shell-toggle-buffer-switch-to-other-window () - "Switch to other window. -If the current window is the only window in the current frame, -create a new window and switch to it. - -\(This is less intrusive to the current window configuration than -`switch-buffer-other-window')" - (let ((this-window (selected-window))) - (other-window 1) - ;; If we did not switch window then we only have one window and need to - ;; create a new one. - (if (eq this-window (selected-window)) - (progn - (split-window-horizontally) - (other-window 1))))) - - :custom - (shell-toggle-launch-shell 'shell-toggle-eshell)) -#+end_src - ** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]] Make =*scratch*= and =*Messages*= unkillable. diff --git a/lib/shell-toggle b/lib/shell-toggle deleted file mode 160000 index 0d01bd9..0000000 --- a/lib/shell-toggle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d01bd9a780fdb7fe6609c552523f4498649a3b9 -- 2.20.1