Zander671/emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a rebase indicator for eshell

Browse Source
This commit is contained in:
Alexander Rosenberg 2024-01-09 15:16:54 -08:00
parent e03cfe1b73
commit a474ebf152
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
init.el
View File

@ -840,11 +840,16 @@ Take directly from doom-modeline."
("trm" "trash-rm $*") ("trm" "trash-rm $*")
("rm" "echo 'rm: I''m unsafe! Don''t use me.'; false") ("rm" "echo 'rm: I''m unsafe! Don''t use me.'; false")
("\\rm" "eshell/rm"))) ("\\rm" "eshell/rm")))
(defvar my/eshell-bm-auto-ls t
"Weather or not to run ls after `eshell/bm'")
(defun eshell/bm (&optional name) (defun eshell/bm (&optional name)
"Change to directory of bookmark NAME. "Change to directory of bookmark NAME.
If no name is given, list all bookmarks instead." If no name is given, list all bookmarks instead."
(if name (if name
(eshell/cd (bookmark-get-filename name)) (progn
(eshell/cd (bookmark-get-filename name))
(when my/eshell-bm-auto-ls
(eshell/ls)))
(eshell-print (string-join (bookmark-all-names) " ")))) (eshell-print (string-join (bookmark-all-names) " "))))
(defun my/-replace-home-with-tilda (path) (defun my/-replace-home-with-tilda (path)
(let ((home (getenv "HOME"))) (let ((home (getenv "HOME")))
@ -930,7 +935,9 @@ If no name is given, list all bookmarks instead."
(let ((git-dir (expand-file-name ".git" (vc-git-root default-directory)))) (let ((git-dir (expand-file-name ".git" (vc-git-root default-directory))))
(cond (cond
((file-exists-p (expand-file-name "REVERT_HEAD" git-dir)) ((file-exists-p (expand-file-name "REVERT_HEAD" git-dir))
"REVERTING")))) "REVERTING")
((file-exists-p (expand-file-name "rebase-merge" git-dir))
"REBASING"))))
(defun my/-eshell-prompt-git-status () (defun my/-eshell-prompt-git-status ()
"Get git status for `my/-eshell-prompt-function'" "Get git status for `my/-eshell-prompt-function'"
(let ((branch (car (vc-git-branches))) (let ((branch (car (vc-git-branches)))
@ -942,7 +949,7 @@ If no name is given, list all bookmarks instead."
(propertize (concat " [" state "]") 'face '(:foreground "red"))) (propertize (concat " [" state "]") 'face '(:foreground "red")))
(when operation (when operation
(concat " (" (propertize operation 'face (concat " (" (propertize operation 'face
'(:weight 'bold :foreground "yellow")) ")"))))) '(:inherit 'bold :foreground "yellow")) ")")))))
(defun my/-eshell-prompt-vc-status () (defun my/-eshell-prompt-vc-status ()
"Get vc status for `my/-eshell-prompt-function'." "Get vc status for `my/-eshell-prompt-function'."
(if-let (backend (vc-responsible-backend default-directory t)) (if-let (backend (vc-responsible-backend default-directory t))