Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile:
  el/dot-emacs.el: Make `tab' key more useful in TeX modes.

diff --git a/bin/mdw-build b/bin/mdw-build
index 9eb466bd7042c7c716e4c3f4855904d4f6604a64..fa3eb3ef63ba9ea12f07abf3d562a07e8d0eee99 100755 (executable)
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -197,8 +197,15 @@ while [ ! -f configure.ac -a ! -f configure.in -a \
 done
 assign srcpath $(pwd)
 
+## Build any necessary qualifiers.
+qual= sep=.
+case ${SBOX_SESSION_DIR+t},${DEB_BUILD_ARCH+t} in
+  t,t) qual=$qual$sep$DEB_BUILD_ARCH; sep=- ;;
+  t,*) fail "unknown build arch" ;;
+esac
+
 ## Construct the output directory.
-assign releasepath $srcpath/dist-$build
+assign releasepath $srcpath/dist-$build$qual
 chmod -R +w $releasepath 2>/dev/null || :
 rm -rf $releasepath 2>/dev/null || :
 mkdir $releasepath
@@ -222,7 +229,7 @@ case "$checkout,$setup,$(yesno [ -d $srcpath/.git ])" in
     cd $srcpath
     [ "$(git ls-files -m)" = "" ] ||
       warn "working tree has uncommitted changes"
-    gitver=$(git describe --abbrev=4)
+    ;;
 esac
 
 ## Is there Debian build equipment?
@@ -241,6 +248,18 @@ case "$debian,$(yesno [ -d $srcpath/debian ])" in
     ;;
 esac
 
+## Maybe check out a copy of the source.
+case "$checkout" in
+  yes)
+    cd $releasepath
+    run git clone -sn $srcpath/.git _source
+    assign srcpath $releasepath/_source
+    cd $srcpath
+    run git checkout -b mdw-build $checkoutrev
+    gitver=$(git describe --abbrev=4)
+    ;;
+esac
+
 ## Check the version number.
 hack_dch_p=no
 case "$gitver,$debver" in
@@ -254,17 +273,6 @@ case "$gitver,$debver" in
     ;;
 esac
 
-## Maybe check out a copy of the source.
-case "$checkout" in
-  yes)
-    cd $releasepath
-    run git clone -sn $srcpath/.git _source
-    assign srcpath $releasepath/_source
-    cd $srcpath
-    run git checkout -b mdw-build $checkoutrev
-    ;;
-esac
-
 ## Maybe refresh the build machinery.
 case "$setup" in
   yes)

diff --git a/dot/gnus.el b/dot/gnus.el
index fbbf62669ff6e86ed072885169bfd8c11a2907b3..46b0a044371cff019470d118c830da464d287146 100644 (file)
--- a/dot/gnus.el
+++ b/dot/gnus.el
@@ -74,6 +74,11 @@ (setq nnimap-split-crosspost t)
 ;; We may have the misfortune to talk to an Exchange server.
 (setq imap-enable-exchange-bug-workaround t)
 
+;; Save articles in mbox format by default, of course, and save an entire
+;; batch with the same name.
+(setq gnus-prompt-before-saving t
+      gnus-default-article-saver 'gnus-summary-save-in-mail)
+
 ;; Clean up properly when closing the summary.
 (defadvice gnus-summary-exit (before mdw-kill-debris compile activate)
   (gnus-summary-expand-window))