# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1288642970 -7200
# Node ID 58e5a1067495a383c9700ba3b9a17a5f214ae29f
# Parent  6662cd4e7a05ff628f26c5afc8c9e3ea2a163c08# Parent  dc4a9f76fdbf28c48fdabe012b93b7601e5cd993
merged

diff -r 6662cd4e7a05 -r 58e5a1067495 .emacs-autogen.sh
--- a/.emacs-autogen.sh	Thu Oct 28 23:08:51 2010 +0300
+++ b/.emacs-autogen.sh	Mon Nov 01 22:22:50 2010 +0200
@@ -14,5 +14,5 @@
 elif which ispell; then
   echo >>$cfg
   echo "(setq-default ispell-program-name \"ispell\")" >>$cfg
-  echo "(setq-default ispell-local-dictionary \"english\")" >>$cfg
+  echo "(setq-default ispell-local-dictionary \"default\")" >>$cfg
 fi
diff -r 6662cd4e7a05 -r 58e5a1067495 .emacs-my
--- a/.emacs-my	Thu Oct 28 23:08:51 2010 +0300
+++ b/.emacs-my	Mon Nov 01 22:22:50 2010 +0200
@@ -97,8 +97,9 @@
     ) )
 
 (menu-bar-mode -1)
-(tool-bar-mode -1)
 (when window-system
+  (scroll-bar-mode 1)
+  (tool-bar-mode -1)
   (defun my-popup-menu ()
     (interactive)
     (mouse-popup-menubar
@@ -109,7 +110,6 @@
   (global-set-key [apps] 'my-popup-menu)
   (global-set-key [menu] 'my-popup-menu)
   (when (>= emacs-major-version 22) (tooltip-mode -1))
-  (scroll-bar-mode 1)
   )
 
 (setq frame-title-format "Emacs - %b")