From: Mark Wooding Date: Mon, 11 Feb 2008 14:55:00 +0000 (+0000) Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/2c7d5c197aac7f5026d6329a503181040981a0fa?hp=6121c48e2dbce8b6a2a4d9a21d583b95b92ee8b0 Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile * 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile: bash_profile: Don't force less to use latin1. Xdefaults: Persuade xterm to use `fixed' for Unicode output. --- diff --git a/Xdefaults b/Xdefaults index 6d6f2e7..62ba871 100644 --- a/Xdefaults +++ b/Xdefaults @@ -2,7 +2,7 @@ ! .Xdefaults ! -#define NICEFONT -adobe-helvetica-medium-r-normal--10-*-*-p-*-iso8859-1 +#define NICEFONT -adobe-helvetica-medium-r-normal--10-*-*-*-p-*-iso8859-1 #define FIXED fixed ! --- General configuration --- @@ -62,7 +62,7 @@ XConsole*geometry: 485x455 ! --- Emacs settings --- -emacs.geometry: 78x33 +emacs.geometry: 77x33 Emacs.pane.menubar.font: NICEFONT Emacs.menu*.font: NICEFONT Emacs.font: FIXED @@ -195,10 +195,10 @@ xzx*libDir: .:/usr/lib/xzx:/usr/local/share/spectrum ! --- Axiom HyperDoc --- -Axiom.hyperdoc.RmFont: -adobe-helvetica-medium-r-normal--12-*-*-p-*-iso8859-1 -Axiom.hyperdoc.BoldFont: -adobe-helvetica-bold-r-normal--12-*-*-p-*-iso8859-1 -Axiom.hyperdoc.ActiveFont: -adobe-helvetica-medium-r-normal--12-*-*-p-*-iso8859-1 -Axiom.hyperdoc.EmphasizeFont: -adobe-helvetica-medium-i-normal--12-*-*-p-*-iso8859-1 +Axiom.hyperdoc.RmFont: -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1 +Axiom.hyperdoc.BoldFont: -adobe-helvetica-bold-r-normal--12-*-*-*-p-*-iso8859-1 +Axiom.hyperdoc.ActiveFont: -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1 +Axiom.hyperdoc.EmphasizeFont: -adobe-helvetica-medium-i-normal--12-*-*-*-p-*-iso8859-1 Axiom.hyperdoc.ActiveColor: blue Axiom.hyperdoc.AxiomFont: FIXED Axiom.hyperdoc.TtFont: FIXED diff --git a/bash_profile b/bash_profile index 3cae439..f3e1d76 100644 --- a/bash_profile +++ b/bash_profile @@ -121,7 +121,13 @@ umask 002 [ -z "$HOST" ] && export HOST=`hostname` -unset LANG LC_COLLATE +if [ "$DISPLAY" = "" ]; then + : ${LC_CTYPE=${LANG-${LC_ALL-`__mdw_conf console-ctype`}}} +else + LC_CTYPE=`__mdw_conf x-ctype` +fi +unset LANG LC_ALL LC_COLLATE +export LC_CTYPE __mdw_programp distcc && export CCACHE_PREFIX=distcc diff --git a/bashrc b/bashrc index 4e941d1..e7eb9c3 100644 --- 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 $ # @@ -30,7 +30,8 @@ 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) diff --git a/dot-emacs.el b/dot-emacs.el index 6643567..9fe9741 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -1,4 +1,4 @@ -;;; -*-emacs-lisp-*- +;;; -*- mode: emacs-lisp; coding: utf-8 -*- ;;; ;;; $Id$ ;;; @@ -580,15 +580,15 @@ (default :foreground "white" :background "black" ,@(cond ((eq window-system 'w32) '(:family "courier new" :height 85)) ((eq window-system 'x) - '(:family "misc-fixed" :width semi-condensed)))) + '(:family "misc-fixed" :height 130 :width semi-condensed)))) (fixed-pitch) (minibuffer-prompt) (mode-line :foreground "blue" :background "yellow" :box (:line-width 1 :style released-button)) - (mode-line-inactive :foreground "grey80" :background "grey30" + (mode-line-inactive :foreground "yellow" :background "blue" :box (:line-width 1 :style released-button)) (scroll-bar :foreground "black" :background "lightgrey") - (fringe :foreground "yellow" :background "grey30") + (fringe :foreground "yellow" :background "black") (show-paren-match-face :background "darkgreen") (show-paren-mismatch-face :background "red") (font-lock-warning-face :background "red" :weight bold) @@ -1643,6 +1643,26 @@ (defun mdw-fontify-tex () (list "[$^_{}#&]" '(0 mdw-punct-face))))) +;;;----- SGML hacking ------------------------------------------------------- + +(defun mdw-sgml-mode () + (interactive) + (sgml-mode) + (mdw-standard-fill-prefix "") + (make-variable-buffer-local 'sgml-delimiters) + (setq sgml-delimiters + '("AND" "&" "COM" "--" "CRO" "&#" "DSC" "]" "DSO" "[" "DTGC" "]" + "DTGO" "[" "ERO" "&" "ETAGO" ":e" "GRPC" ")" "GRPO" "(" "LIT" "\"" + "LITA" "'" "MDC" ">" "MDO" "" "PIO" "" + "XML-ECOM" "-->" "XML-PIC" "?>" "XML-SCOM" "" "XML-PIC" "?>" "XML-SCOM" "