diff -r cfc3164f3259 -r a325b9a15b8e .emacs-my --- a/.emacs-my Wed Jun 23 16:10:21 2010 +0300 +++ b/.emacs-my Tue Jul 13 23:06:09 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")