Merge commit 'metalzone/master'

* commit 'metalzone/master':
  Configuration for top.
  emacs: Start actually doing some Emacs-side SLIME customization.
  bash_profile: Force ncurses to use UTF8 line-drawing characters.
  dot-emacs: remove stray debugging code.
  tig: Fix colours, in particular the cursor line.
  gitconfig: New alias `git files'.
  dot-emacs: Hack dired-maybe-insert-subdir to honour marks.
  gitignore: Ignore more boring things.
  tigrc: Don't bold entries in the diff.
  dot-emacs: Force buffer-file-coding-system to utf-8 for news articles.

diff --git a/dot-emacs.el b/dot-emacs.el
index 8a724ab..704f37d 100644 (file)
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -448,7 +448,10 @@ a list of things:
 (make-variable-buffer-local 'mdw-fill-prefix)
 
 (defvar mdw-hanging-indents
-  "\\(\\(\\([*o]\\|--\\|[0-9]+\\.\\|\\[[0-9]+\\]\\|([a-zA-Z])\\)[ \t]+\\)?\\)"
+  (concat "\\(\\("
+           "\\([*o]\\|-[-#]?\\|[0-9]+\\.\\|\\[[0-9]+\\]\\|([a-zA-Z])\\)"
+           "[ \t]+"
+         "\\)?\\)")
   "*Standard regular expression matching things which might be part of a
 hanging indent.  This is mainly useful in `auto-fill-mode'.")
 
@@ -1280,7 +1283,7 @@ strip numbers instead."
                      "del" "elif" "else" "except" "exec" "finally" "for"
                      "from" "global" "if" "import" "in" "is" "lambda"
                      "not" "or" "pass" "print" "raise" "return" "try"
-                     "while" "yield")))
+                     "while" "with" "yield")))
     (setq font-lock-keywords
          (list
 

diff --git a/emacs b/emacs
index 9ce28d5..db08611 100644 (file)
--- a/emacs
+++ b/emacs
@@ -95,13 +95,6 @@
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 
-;; --- GNUS configuration ---
-
-(setq gnus-select-method '(nntp "tux.nsict.org"))
-(setq gnus-read-active-file 'some)
-(setq gnus-inhibit-startup-message t)
-(setq gnus-large-newsgroup 500)
-
 ;; --- Internationalization twiddling ---
 
 (trap
@@ -170,7 +163,7 @@
 (trap
   (tooltip-mode 0)
   (tool-bar-mode 0))
-;;(trap (global-auto-revert-mode t))
+(trap (or mdw-fast-startup (global-auto-revert-mode t)))
 (setq psgml-html-build-new-buffer nil)
 
 (setq cltl2-root-url (mdw-config 'cltl-url))

diff --git a/gitconfig b/gitconfig
index 5499062..1f90ebf 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -70,6 +70,10 @@
        git = git@vger.kernel.org
        mdw = mdw@distorted.org.uk
 
+[sendemail]
+       chainreplyto = no
+       signedoffcc = yes
+
 [gui]
        fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
        fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0

diff --git a/xshutdown b/xshutdown
index 83963c8..56c7c5a 100755 (executable)
--- a/xshutdown
+++ b/xshutdown
@@ -5,5 +5,8 @@ answer=$(xmsg -Q -t xshutdown -d "Really shutdown this session?" \
          "Terminating an X session prematurely can really ruin your day." \
          =yes:gtk-yes =no:default:cancel:gtk-no)
 case "$answer" in
-  yes) xatom set XINIT_COMMAND !break ;;
+  yes)
+    xatom set XINIT_COMMAND !break
+    xatom set XWAIT_DIE XWAIT_DIE_NOW
+    ;;
 esac