Only set tool/scrollbar modes when we're using X.

diff --git a/.emacs b/.emacs
index e1c5691d121680e88abd97079bef868bcc2c7ef8..87d2eb905bc4a2f7751a5f9fa06a55c35054e0b0 100644 (file)
--- 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.