random updates

git-svn-id: file:///svn/tfheen/trunk/dotfiles@792 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index fc1b267e7851f5a6ffc57510c54df89426915059..fa6aa1c1ba58847ce63160aa96683fba9131c4dc 100644 (file)
--- a/emacs
+++ b/emacs
@@ -23,9 +23,14 @@
 (auto-compression-mode t)
 
 (cw/for-emacs
- (set-language-environment "Latin-1")
+ (if (string-match "[Uu][Tt][Ff]-?8" (or (getenv "LC_ALL")
+                                         (getenv "LANG")
+                                         (format ""))) 
+     (set-language-environment "UTF-8") ; UTF-8 mode
+   (set-language-environment "Latin-1"))
+ 
  (if (not window-system) 
-     (set-keyboard-coding-system 'latin-1)))
+     (set-keyboard-coding-system 'utf-8)))
 
 ;(prefer-coding-system "utf-8")
 
@@ -170,7 +175,7 @@
        (setq scrollbars-visible-p nil))))
 
 (setq scroll-bar-mode nil)
-(set-default-font "fixed")
+; (set-default-font "fixed")
 
 ;      show-paren-style 'expression)
 
@@ -189,7 +194,9 @@
  (setq mmm-global-mode 'maybe)
  (set-face-background 'mmm-default-submode-face "White"))
 
-(set-face-foreground font-lock-string-face "Blue")
+(cw/requiring-package
+    (font-lock)
+  (set-face-foreground (find-face font-lock-string-face) "Blue"))
 
 (cw/requiring-package (tramp)
   (setq tramp-auto-save-directory "/home/tfheen/tmp"
@@ -203,7 +210,7 @@
 ;;                             tramp-file-name-structure '("\\`/r:\\(\\([a-zA-Z0-9]+\\)/\\)?\\(\\([-a-zA-Z0-9_#/:]+\\)@\\)?\\([-a-zA-Z0-9_#/:@.]+\\):\\(.*\\)\\'" 2 4 5 6)))
 
 
-(cw/for-emacs-21
+(cw/for-emacs-21-and-later
  (blink-cursor-mode 0)
  (if window-system
      (tooltip-mode 0))
@@ -230,13 +237,17 @@
 
 ; Mode line
 (display-time)
-(display-battery)
+
+;(cw/for-emacs-21
+; (display-battery))
+;(cw/for-emacs-22
+; (display-battery-mode))
 (setq display-time-format "%H:%M"
       display-time-string-forms '(24-hours ":" minutes))
 
 (setq show-trailing-whitespace t)
 (setq-default indent-tabs-mode nil)
-(cw/for-emacs-21
+(cw/for-emacs-21-and-later
  (define-coding-system-alias 'iso885915 'iso-8859-15)
  (if (not window-system)
      (define-coding-system-alias 'iso-8859-15 'iso-8859-1)))