Merge remote-tracking branch 'crybaby'

* crybaby:
  dot/bash*: Reformat.
  mc: Store configuration and arrange for linkage.

diff --git a/bin/sendmail-hack b/bin/sendmail-hack
new file mode 100755 (executable)
index 0000000..0ce0ea3
--- /dev/null
+++ b/bin/sendmail-hack
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+set -e
+unset LD_PRELOAD
+exec ${REAL_SENDMAIL-/usr/sbin/sendmail} "$@"

diff --git a/dot/bash_profile b/dot/bash_profile
index de5a5cf551ac96411ca5f014f40bee9290fa8d34..1621d13d56cb4182015d063bba1d934fbf520afd 100644 (file)
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -135,7 +135,8 @@ else
   : ${LANG=${LC_CTYPE-${LC_ALL-`mdw-conf console-ctype`}}}
   case "$TERM,`tty`" in
     linux,/dev/tty*)
-      if vt-is-UTF8 >/dev/null 2>&1; then
+      if { vt-is-UTF8 ||
+          kbd_mode | grep UTF-8; } >/dev/null 2>&1; then
        ctype=.utf8
       else
        ctype=

diff --git a/setup b/setup
index d1322f506d692050f1bdc4061a476f7924cf4573..79f452df967bae9e5cef0c347d2d6933a08f73d4 100755 (executable)
--- a/setup
+++ b/setup
@@ -230,6 +230,7 @@ scripts="
   mdw-build
   emacsclient-hack
   movemail-hack
+  sendmail-hack
   aspell-hack
   emerge-hack
   lesspipe.sh