diff -r 102845496d41 -r 9382e2dce0ed .emacs-my
--- a/.emacs-my	Tue Oct 16 15:41:34 2012 +0300
+++ b/.emacs-my	Tue Oct 16 21:15:57 2012 +0300
@@ -220,6 +220,7 @@
   (mouse-avoidance-mode 'animate)
   (scroll-bar-mode 1)
   (tool-bar-mode -1)
+  (setq-default line-spacing nil)
   (defun my-popup-menu ()
     (interactive)
     (mouse-popup-menubar
@@ -511,31 +512,6 @@
         ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "switching, creating, selecting buffers")
-
-(iswitchb-mode 1)
-(setq iswitchb-buffer-ignore
-      '("^ "
-        "^\*Buffer"
-        "^\*Completions\*"
-        "^\*tramp"
-        "^\*Dired log\*"
-        "^\*Quail Completions\*"
-        "^\*Disabled Command\*"
-        "^TAGS"
-        ))
-
-(require 'uniquify)
-(setq uniquify-buffer-name-style 'post-forward)
-(setq uniquify-separator "|")
-(setq uniquify-after-kill-buffer-p t)
-
-(setq read-buffer-completion-ignore-case t)
-
-;; buffer-menu better then buffer-list, but ibuffer much better.
-(global-set-key "\C-x\C-b" 'ibuffer)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "scrolling")
 
 (defvar my-scroll-margin 4)
@@ -669,12 +645,6 @@
 ;; (pc-bindings-mode) ; Myself define keybinding, see
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "completion")
-
-;; I remove partial-completion-mode because it depricated in Emacs 24.0.
-;; Completion controled by 'completion-styles' variable.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "mouse")
 
 ;; Scroll Bar gets dragged by mouse butn 1
@@ -696,23 +666,12 @@
 (global-set-key [delete]     'delete-char)
 ;; (global-set-key [backspace]  'backward-delete-char-untabify) ; not work properly in *info* mode
 
-;; setting some f[1-12] keys
-(global-set-key [f1]    'help)
 (global-set-key [f2]    'save-buffer)
-(global-set-key [f4]    'ispell-buffer)
 (global-set-key [S-f6]  'rename-buffer)
-(global-set-key [f8]    'kill-this-buffer)
 (global-set-key (kbd "C-x C-k") 'kill-this-buffer)
 (global-set-key [M-f4]  'save-buffers-kill-emacs)
 (global-set-key [f6]    'toggle-truncate-lines)
 
-;; frames, windows manipulation, switch buffers
-(global-set-key [?\C-x right] 'next-buffer)
-(global-set-key [?\C-x left]  'previous-buffer)
-
-(global-set-key (kbd "\e\eg") 'goto-line)
-(global-set-key (kbd "\e\er") 'query-replace-regexp)
-
 ;; Disable suspend. It ugly.
 (when window-system
   (global-set-key (kbd "C-z") nil))
@@ -765,6 +724,55 @@
  )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "switching, creating, selecting buffers")
+
+(global-set-key [?\C-x right] 'next-buffer)
+(global-set-key [?\C-x left]  'previous-buffer)
+
+(iswitchb-mode 1)
+(setq iswitchb-buffer-ignore
+      '("^ "
+        "^\*Buffer"
+        "^\*Completions\*"
+        "^\*tramp"
+        "^\*Dired log\*"
+        "^\*Quail Completions\*"
+        "^\*Disabled Command\*"
+        "^TAGS"
+        ))
+
+(require 'uniquify)
+(setq uniquify-buffer-name-style 'post-forward)
+(setq uniquify-separator "|")
+(setq uniquify-after-kill-buffer-p t)
+
+(setq read-buffer-completion-ignore-case t)
+
+;; buffer-menu better then buffer-list, but ibuffer much better.
+(global-set-key "\C-x\C-b" 'ibuffer)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "minibuffer")
+
+(require 'icomplete) ; Interactive completion in minibuffer.
+(icomplete-mode 1)
+
+(mapc (lambda (ext) (add-to-list 'completion-ignored-extensions ext))
+      '(
+        ".class" "~" ".aux"
+        ".o" ".obj" ".map" ".lib" ".lo" ".la" ".a" ".bin" ".exe"
+        ;; Place dir at end to appear at the start of completion-ignored-extensions.
+        "CVS/" ".hg/" ".svn/" ".git/" ".bzr/"
+        ) )
+(setq read-file-name-completion-ignore-case t)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "completion")
+
+;; I remove partial-completion-mode because it depricated in Emacs 24.0.
+;; Completion controled by 'completion-styles' variable.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "open file, ffap, dired")
 
 (setq-default save-place t)
@@ -895,21 +903,6 @@
      ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "minibuffer")
-
-(require 'icomplete) ; Interactive completion in minibuffer.
-(icomplete-mode 1)
-
-(mapc (lambda (ext) (add-to-list 'completion-ignored-extensions ext))
-      '(
-        ".class" "~" ".aux"
-        ".o" ".obj" ".map" ".lib" ".lo" ".la" ".a" ".bin" ".exe"
-        ;; Place dir at end to appear at the start of completion-ignored-extensions.
-        "CVS/" ".hg/" ".svn/" ".git/" ".bzr/"
-        ) )
-(setq read-file-name-completion-ignore-case t)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "url")
 
 ;; http://tools.ietf.org/html/rfc3986
@@ -1889,6 +1882,7 @@
 (setq ediff-diff-options "")
 (setq ediff-custom-diff-options "-u")
 (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+(setq ediff-split-window-function 'split-window-vertically)
 
 (when window-system
   (eval-after-load 'diff-mode
@@ -1962,6 +1956,12 @@
      ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "scons")
+
+(add-to-list 'auto-mode-alist '("SConstruct\\'" . python-mode))
+(add-to-list 'auto-mode-alist '("SConscript\\'" . python-mode))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "TAGS, etags, ctags, GNU GLOBAL")
 
 ;; One of 'tags-table-list' or 'tags-file-name' control which TAGS files to
@@ -2184,6 +2184,8 @@
     ;; (py-toggle-shells 'cpython)
     ))
 
+;; Enable "M-/", "C-c g", "C-c d", "C-c f" shortcuts.
+(setq ropemacs-enable-shortcuts t)
 (ignore-errors
   (require 'pymacs)
   (pymacs-load "ropemacs" "rope-")
@@ -2291,6 +2293,15 @@
 (setq ecb-tip-of-the-day nil)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "htmlize")
+
+(setq
+ htmlize-html-charset "utf-8"
+ htmlize-output-type 'inline-css
+ htmlize-html-major-mode 'html-mode
+ htmlize-convert-nonascii-to-entities nil)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "html")
 
 (add-to-list 'auto-mode-alist '("\\.jsp\\'" . html-mode))