dot/emacs, el/dot-emacs.el: Fix patterns for root prompt.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index beaf7bf..c291fdd 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -45,7 +45,7 @@
      (add-to-list 'auto-mode-alist
                  `(,(concat "/debian/"
                               "\\("
-                                "[" "[:lower:][:digit:]]"
+                                "[" "[:lower:][:digit:]]"
                                     "[[:lower:][:digit:].+-" "]+"
                                 "\\."
                               "\\)?"
@@ -54,10 +54,9 @@
 
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
+     (not (memq 'Git vc-handled-backends))
+     (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
-(and (library-exists-p "quilt")
-     (not mdw-fast-startup)
-     (load "quilt"))
 
 (trap (or mdw-fast-startup (require 'p4)))
 
@@ -89,9 +88,9 @@
 ;; Emacs server behaviour.
 
 (and (or window-system (>= emacs-major-version 23))
-     (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
-          (server-start)
-          (gnuserv-start)))
+     (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+                 gnuserv-frame t)
+           (trap (server-start))))
 
 ;; Control backup behaviour.
 
@@ -204,7 +203,11 @@
 (setq-default fill-column 77)          ;I use rather narrow windows
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil)
-(setq woman-use-own-frame nil)         ;Keep man pages somewhere sensible
+(setq default-indicate-empty-lines t)
+(setq whitespace-style
+      '(trailing space-before-tab space-after-tab empty indentation))
+(setq woman-use-own-frame nil          ;Keep man pages somewhere sensible
+      woman-fill-column 72)            ;Right margin position.
 (setq diff-switches "-u"               ;I like reading unified diffs
       cvs-diff-flags (list diff-switches))
 (setq echo-keystrokes 10)              ;Long delay before keystrokes echo
@@ -215,6 +218,8 @@
 (setq x-gtk-file-dialog-help-text nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
+(setq-default proced-filter 'all
+             proced-sort 'user)
 (setq ispell-program-name "aspell"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
@@ -370,15 +375,12 @@
         (scroll-bar-width . 15)
         (cursor-color . "red"))
        (if mdw-black-background
-          '((background-color . "black")
-            (foreground-color . "white")
-            (background-mode . dark))
+          '((background-mode . dark))
         '((background-mode . light)))
        (and (eq window-system 'pm)
            '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
              (menu-font . "8.Helv")
              (background-color . "lightgrey")))
-       '((transparency . t))
        default-frame-alist))
 
 ;; Other frame fiddling.
@@ -448,6 +450,7 @@
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs$" . csharp-mode)
+               ("\\.go$" . go-mode)
                ("\\.org$" . org-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
@@ -493,7 +496,7 @@
        '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
          csharp-mode-hook perl-mode-hook cperl-mode-hook
          python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
-         tcl-mode-hook
+         tcl-mode-hook go-mode-hook
          asm-mode-hook TeX-mode-hook LaTeX-mode-hook
          TeXinfo-mode-hook tex-mode-hook latex-mode-hook
          texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
@@ -520,12 +523,13 @@
               (tramp-copy-program nil)
               (tramp-copy-args nil)
               (tramp-copy-keep-date-arg nil)
-              (tramp-login-args ("TERM=dumb" "%u")))
+              (tramp-login-args (("TERM=dumb" "%u"))))
              ("really"
               (tramp-connection-function tramp-open-connection-su)
               (tramp-login-program "really")
-              (tramp-login-args ("-u" "%u" "--"
-                                 "env" "TERM=dumb" "/bin/sh"))
+              (tramp-login-args (("-u" "%u")
+                                 ("--")
+                                 ("env" "TERM=dumb" "/bin/sh")))
               (tramp-copy-program nil)
               (tramp-copy-args nil)
               (tramp-copy-keep-date-arg nil)
@@ -559,6 +563,7 @@
   (add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t)
   (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
   (add-hook 'asm-mode-hook 'mdw-fontify-asm t)
+  (add-hook 'go-mode-hook 'mdw-fontify-go t)
 
   (add-hook 'icon-mode-hook 'mdw-fontify-icon t)
 
@@ -719,7 +724,7 @@
 
 ;; Make the shell mode aware of my prompt.
 
-(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
              "[Pp]assword\\|pass phrase\\):"))