X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/3ba0b7778354b6be6c7889b48a86874c48ae9ac9..2c49e0816cc0cbf93d5763f962cc46f07eb70ffb:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 08cc3de..c51803b 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -746,8 +746,9 @@ case."
   (mdw-whitespace-mode 1)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
-  (outline-minor-mode t)
-  (hs-minor-mode t)
+  (if (fboundp 'hs-minor-mode)
+      (hs-minor-mode t)
+    (outline-minor-mode t))
   (reveal-mode t)
   (trap (turn-on-font-lock)))
 
@@ -865,6 +866,13 @@ doesn't match any of the regular expressions in
 (mdw-define-face comint-highlight-input
   (t nil))
 
+(mdw-define-face dired-directory
+  (t :foreground "cyan" :weight bold))
+(mdw-define-face dired-symlink
+  (t :foreground "cyan"))
+(mdw-define-face dired-perm-write
+  (t nil))
+
 (mdw-define-face trailing-whitespace
   (((class color)) :background "red")
   (t :inverse-video t))
@@ -922,6 +930,8 @@ doesn't match any of the regular expressions in
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-name
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face which-func
+  (t nil))
 
 (mdw-define-face diff-index
   (t :weight bold))
@@ -1930,8 +1940,7 @@ strip numbers instead."
 ;;;--------------------------------------------------------------------------
 ;;; Erlang configuration.
 
-(setq erlang-electric-commannds
-      '(erlang-electric-newline erlang-electric-semicolon))
+(setq erlang-electric-commands nil)
 
 (defun mdw-fontify-erlang ()
 
@@ -2126,13 +2135,21 @@ strip numbers instead."
 	    (save-match-data
 	      (replace-regexp-in-string "\\..*$" "" (system-name)))
 	    " "
-	    (eshell/pwd)
+	    (let* ((pwd (eshell/pwd)) (npwd (length pwd))
+		   (home (expand-file-name "~")) (nhome (length home)))
+	      (if (and (>= npwd nhome)
+		       (or (= nhome npwd)
+			   (= (elt pwd nhome) ?/)
+		       (string= (substring pwd 0 nhome) home)))
+		  (concat "~" (substring pwd (length home)))
+		pwd))
 	    right)))
 (setq eshell-prompt-function 'mdw-eshell-prompt)
 (setq eshell-prompt-regexp "^\\[[^]>]+\\(\\]\\|>>?\\)")
 
-(defalias 'eshell/e 'find-file)
-(defalias 'eshell/w3m 'w3m-goto-url)
+(defun eshell/e (file) (find-file file) nil)
+(defun eshell/ee (file) (find-file-other-window file) nil)
+(defun eshell/w3m (url) (w3m-goto-url url) nil)
 
 (mdw-define-face eshell-prompt (t :weight bold))
 (mdw-define-face eshell-ls-archive (t :weight bold :foreground "red"))