From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 9 Dec 2009 00:45:50 +0000 (+0000)
Subject: Merge commit 'ponder'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/74e49a250d6ef2039f60a9a4d9e2408b2856ead6?hp=-c

Merge commit 'ponder'

* commit 'ponder':
  dot/emacs: Tweaking for `proced'.
  bg/lovelace.jpg: New background of Ada.
  dot/emacs: Remove multihop tramp stuff.
---

74e49a250d6ef2039f60a9a4d9e2408b2856ead6
diff --combined dot/emacs
index b1c5e4b,ddabb00..59ac6bf
--- a/dot/emacs
+++ b/dot/emacs
@@@ -89,9 -89,9 +89,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.
  
@@@ -215,6 -215,8 +215,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"
@@@ -448,7 -450,6 +450,7 @@@
  		("\\.m$" . objc-mode)
  		("\\.mxd$" . c-mode)
  		("\\.cs$" . csharp-mode)
 +		("\\.go$" . go-mode)
  		("\\.org$" . org-mode)
  		;; ("/[ch]/" . c-mode)
  		(,(concat "/\\("
@@@ -494,7 -495,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
@@@ -532,11 -533,6 +534,6 @@@
  	       (tramp-copy-keep-date-arg nil)
  	       (tramp-remote-sh "/bin/sh"))
  	      ,@tramp-methods)))
-      (setq tramp-multi-connection-function-alist
- 	   (mdw-uniquify-alist
- 	    '(("bc" tramp-multi-connect-su "become TERM=dumb %u%n"))
- 	    '(("r" tramp-multi-connect-su "really -u %u%n"))
- 	    tramp-multi-connection-function-alist))
       (setq tramp-default-method "ssh")
       (setq tramp-default-method-alist
  	   `(("\\`localhost\\'" ""
@@@ -565,7 -561,6 +562,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)
  
diff --combined setup
index e48ce2e,0bd95f6..42c0cd7
--- a/setup
+++ b/setup
@@@ -174,7 -174,8 +174,8 @@@ backgrounds=
    bsg-supper.jpg
    rayne.jpg
    hypatia.jpg
-   noodly.jpg"
+   noodly.jpg
+   lovelace.jpg"
  if [ "$xstuff" ]; then
    echo "Installing backgrounds..."
    for b in $backgrounds; do
@@@ -212,7 -213,6 +213,7 @@@ scripts=
    mdw-pager
    mdw-conf
    mdw-build
 +  emacsclient-hack
    movemail-hack
    emerge-hack
    lesspipe.sh