X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9de6616900746b80430daa155840715a09aaf1bb..79ba2d3537913b2f1aef104fb43b7c2c20eb0781:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index ddabb00..054f9da 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -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.
 
@@ -372,15 +371,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.
@@ -450,6 +446,7 @@
 		("\\.m$" . objc-mode)
 		("\\.mxd$" . c-mode)
 		("\\.cs$" . csharp-mode)
+		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
@@ -495,7 +492,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
@@ -522,12 +519,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)
@@ -561,6 +559,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)