X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=.emacs;h=4732256f31692726080c24d0cb7e6f76bc5c649a;hb=c8ef0ff3bd4f0b1ddaaadf9770d64db7fe28159a;hp=e1c5691d121680e88abd97079bef868bcc2c7ef8;hpb=96bbad908b4dc4f4acbd037411f044beb37bb8d1;p=emacs.d.git

diff --git a/.emacs b/.emacs
index e1c5691..4732256 100644
--- a/.emacs
+++ b/.emacs
@@ -7,12 +7,14 @@
 ;; Set the frame title to the name of the buffer, if supported.
 (setq frame-title-format "%b")
 
-;; Disable the menu/tool bars
+;; Disable the menu/tool bars when we're using X.
 (menu-bar-mode -1)
-(tool-bar-mode -1)
+(when window-system
+  (tool-bar-mode -1))
 
 ;; And put the damned scroll bar on the correct side.
-(set-scroll-bar-mode 'right)
+(when window-system
+  (set-scroll-bar-mode 'right))
 
 ;; The most important statement in this file.
 ;; Do not display a splash screen on startup.
@@ -74,6 +76,8 @@
 (load-library "diff-buffer-against-file")
 (global-set-key "\C-cd" 'diff-buffer-against-file)
 
+(load-library "fix-nonstandard-chars")
+
 
 ;; These next functions override the defaults provided by emacs. They
 ;; prevent warning messages related to file modification times,