# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1279142796 -10800
# Node ID b7d7ad68eee514cd5a0203de0c8fc9844cd1a015
# Parent  db4e5cb95666322930da755e0773f3e0121db830# Parent  a325b9a15b8eb78d333c05f61fd93100b3c85493
merged

diff -r db4e5cb95666 -r b7d7ad68eee5 .emacs-my
--- a/.emacs-my	Tue Jul 13 11:26:33 2010 +0300
+++ b/.emacs-my	Thu Jul 15 00:26:36 2010 +0300
@@ -87,8 +87,10 @@
 
 (menu-bar-mode -1)
 (tool-bar-mode -1)
-(when (>= emacs-major-version 22) (tooltip-mode -1))
-(scroll-bar-mode 1)
+(when window-system
+  (when (>= emacs-major-version 22) (tooltip-mode -1))
+  (scroll-bar-mode 1)
+  )
 
 (setq frame-title-format "Emacs - %b")