X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/db10ce0a153621ddb8d66ae9a756bbccc828c088..6b440e3f1a67b73bb35b1469f18065d18aa5402e:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index c1e542a..649eaaf 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -87,9 +87,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.
 
@@ -445,6 +445,7 @@
 		("\\.m$" . objc-mode)
 		("\\.mxd$" . c-mode)
 		("\\.cs$" . csharp-mode)
+		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
@@ -490,7 +491,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
@@ -557,6 +558,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)