X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ed7b46b929b31bc38b472caeeededbd676371afc..106b85a3371bbe8d0eaad3c78ec939a69a2006a7:/el/dot-emacs.el?ds=sidebyside

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 4d82b1a..f66b833 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -681,6 +681,8 @@ case."
   (auto-fill-mode 1)
   (setq fill-column 77)
   (setq show-trailing-whitespace t)
+  (let ((whitespace-style (remove 'trailing whitespace-style)))
+    (trap (whitespace-mode t)))
   (and (fboundp 'gtags-mode)
        (gtags-mode))
   (outline-minor-mode t)
@@ -737,7 +739,6 @@ doesn't match any of the regular expressions in
 					  frame-display)
 				 (progn "frame %s still uses us" nil)))
 			  (frame-list))))
-      (message "turn out the lights")
       (run-with-idle-timer 0 nil #'x-close-connection frame-display))))
 (add-hook 'delete-frame-functions 'mdw-last-one-out-turn-off-the-lights)
 
@@ -2054,6 +2055,32 @@ strip numbers instead."
   (setq sh-basic-offset 2))
 
 ;;;--------------------------------------------------------------------------
+;;; Emacs shell mode.
+
+(defun mdw-eshell-prompt ()
+  (let ((left "[") (right "]"))
+    (when (= (user-uid) 0)
+      (setq left "«" right "»"))
+    (concat left
+	    (save-match-data
+	      (replace-regexp-in-string "\\..*$" "" (system-name)))
+	    " "
+	    (eshell/pwd)
+	    right)))
+(setq eshell-prompt-function 'mdw-eshell-prompt)
+(setq eshell-prompt-regexp "^\\[[^]]+\\]")
+
+(mdw-define-face eshell-prompt (t :weight bold))
+(mdw-define-face eshell-ls-archive (t :weight bold :foreground "red"))
+(mdw-define-face eshell-ls-backup (t :foreground "lightgrey" :slant italic))
+(mdw-define-face eshell-ls-product (t :foreground "lightgrey" :slant italic))
+(mdw-define-face eshell-ls-clutter (t :foreground "lightgrey" :slant italic))
+(mdw-define-face eshell-ls-executable (t :weight bold))
+(mdw-define-face eshell-ls-directory (t :foreground "cyan" :weight bold))
+(mdw-define-face eshell-ls-readonly (t nil))
+(mdw-define-face eshell-ls-symlink (t :foreground "cyan"))
+
+;;;--------------------------------------------------------------------------
 ;;; Messages-file mode.
 
 (defun messages-mode-guts ()