Merge commit 'ponder'

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

diff --git a/bg/lovelace.jpg b/bg/lovelace.jpg
new file mode 100644 (file)
index 0000000..1a8be5b
Binary files /dev/null and b/bg/lovelace.jpg differ

diff --git a/dot/emacs b/dot/emacs
index b1c5e4b..59ac6bf 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -215,6 +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"
@@ -532,11 +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\\'" ""

diff --git a/setup b/setup
index e48ce2e..42c0cd7 100755 (executable)
--- a/setup
+++ b/setup
@@ -174,7 +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