putty-defaults: Revert bogus change to Putty terminal height.

[profile] / bashrc

diff --git a/bashrc b/bashrc
index 82d50c8..e7eb9c3 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -1,4 +1,4 @@
-# -*-sh-*-
+# -*- mode: sh; coding: utf-8 -*-
 #
 # $Id: .bashrc,v 1.6 1996/12/08 20:33:42 mdw Exp $
 #
@@ -21,7 +21,7 @@ if [ -t 0 ]; then
     PS2="> "
     PS4="+ "
   else
-    
+
     case "$TERM" in
       linux*|screen*|xterm*|vt100*)
        bold='\[\e[1m\]' unbold='\[\e[m\]' nl='\[\r\]' ;;
@@ -30,10 +30,11 @@ if [ -t 0 ]; then
     esac
 
     if (( EUID == 0 )); then
-      left="«" right="»"
+      left=`echo « | iconv -f utf8 -t //translit`
+      right=`echo » | iconv -f utf8 -t //translit`
     else
       case $USER in
-        mdw|mwooding)
+       mdw|mwooding)
          u="" left="[" right="]"
          ;;
        *)
@@ -43,7 +44,7 @@ if [ -t 0 ]; then
       if [ "$__mdw_tty" = "`tty`" ]; then
        left="<" right=">"
       else
-        export __mdw_tty="`tty`"
+       export __mdw_tty="`tty`"
       fi
     fi
 
@@ -86,7 +87,7 @@ shopt -u shift_verbose
 shopt -s sourcepath
 
 # --- Set the CDPATH ---
-# 
+#
 # CDPATH=~/src:/usr/src:/usr/lib:/usr/share
 # dots=..
 # i=6
@@ -130,6 +131,9 @@ alias e="$EDITOR"
 alias svn="svnwrap svn"
 alias @="ssh"
 
+[ -r /etc/bash_completion ] && . /etc/bash_completion
+[ -r $HOME/.bash_completion ] && . $HOME/.bash_completion
+
 # --- Make `xt' start an xterm, maybe logging into a remote host ---
 
 xt () {
@@ -234,13 +238,13 @@ pathhack () {
        continue
        ;;
       --)
-        shift
+       shift
        break
        ;;
       [-+]*)
-        ;;
+       ;;
       *)
-        break
+       break
        ;;
     esac
     hack=${arg#[+-]}
@@ -251,16 +255,16 @@ pathhack () {
     }
     case "$arg,$force,:$PATH:" in
       -*,*,*:"$dir":*)
-        path-remove path "$dir"
+       path-remove path "$dir"
        ;;
       +*,t,*:"$dir":*)
-        path-remove path "$dir"
+       path-remove path "$dir"
        path-add path "$dir"
        ;;
       +*,nil,*:"$dir":*)
-        ;;
+       ;;
       +*,*)
-        path-add path "$dir"
+       path-add path "$dir"
        ;;
     esac
     shift
@@ -298,4 +302,6 @@ if (( UID == 0 )); then
   set -o noclobber
 fi
 
+[ -f "$HOME/.bashrc-local" ] && . "$HOME/.bashrc-local"
+
 fi