dot/emacs: Sort the global keybindings list.

[profile] / dot / profile

diff --git a/dot/profile b/dot/profile
index e46e627b76ed5aa9acb2f0d1dc3ca68fdf27c70d..acf616758816925c17add724316ff8c5e9c8b04f 100644 (file)
--- a/dot/profile
+++ b/dot/profile
@@ -83,10 +83,13 @@ __mdw_addto PATH l \
   /opt/nfast/bin /opt/nfast/sbin
 
 ## If we have Plan 9 from User Space, then add that in.
-if [ -d /usr/local/plan9 ]; then
-  PLAN9=/usr/local/plan9; export PLAN9
-  __mdw_addto PATH r $PLAN9/bin
-fi
+for i in /opt/plan9 /usr/local/plan9; do
+  if [ -d $i ]; then
+    PLAN9=$i; export PLAN9
+    __mdw_addto PATH r $i/bin
+    break
+  fi
+done
 
 ## Check for some standard path hacks.
 for i in ccache; do
@@ -130,8 +133,11 @@ unset ed emacs_startup_args
 ###--------------------------------------------------------------------------
 ### Locale configuration.
 
-case ${DISPLAY+t} in
-  t)
+case ${LC_MDWSSHLANG+t},${DISPLAY+t} in
+  t,*)
+    LANG=$LC_MDWSSHLANG
+    ;;
+  ,t)
     __mdw_setconf LANG x-ctype POSIX
     ;;
   *)
@@ -139,7 +145,7 @@ case ${DISPLAY+t} in
     case "$TERM,$(tty)" in
       linux,/dev/tty*)
        if { vt-is-UTF8 || kbd_mode | grep UTF-8; } >/dev/null 2>&1; then
-         ctype=.utf8
+         ctype=.UTF-8
        else
          ctype=
        fi
@@ -153,6 +159,10 @@ export LANG
 
 LC_COLLATE=POSIX; export LC_COLLATE
 
+case ${LANG+t} in
+  t) LC_MDWSSHLANG=$LANG; export LC_MDWSSHLANG ;;
+esac
+
 ###--------------------------------------------------------------------------
 ### Pagers.
 
@@ -198,13 +208,19 @@ case "${http_proxy-none},$http" in
   *,none) ;;
   none,*) http_proxy=http://$http/; export http_proxy ;;
 esac
+https=$(mdw-conf https-proxy none)
+case "${https_proxy-none},$https,${http_proxy-none}" in
+  *,none,none) ;;
+  none,none,*) https_proxy=$http_proxy; export https_proxy ;;
+  none,*,*) https_proxy=http://$https/; export ftp_proxy ;;
+esac
 ftp=$(mdw-conf ftp-proxy none)
 case "${ftp_proxy-none},$ftp,${http_proxy-none}" in
   *,none,none) ;;
   none,none,*) ftp_proxy=$http_proxy; export ftp_proxy ;;
   none,*,*) ftp_proxy=http://$ftp/; export ftp_proxy ;;
 esac
-unset http ftp
+unset http https ftp
 
 ## Ncurses programs should use the Unicode box-drawing characters because the
 ## alternative character set stuff isn't supported well.
@@ -254,6 +270,10 @@ OOO_FORCE_DESKTOP=gnome; export OOO_FORCE_DESKTOP
 ## Hack Qt-ish things to be unstoatly.
 QT_STYLE_OVERRIDE=gtk2; export QT_STYLE_OVERRIDE
 
+## Use X11 input method (including compose key sequences) everywhere.
+GTK_IM_MODULE=xim; export GTK_IM_MODULE
+QT_IM_MODULE=xim; export QT_IM_MODULE
+
 ## Configure `ps'.
 PS_PERSONALITY=gnu; export PS_PERSONALITY