# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1255892302 -10800
# Node ID 29dc0658b75d68f7093a1e799a5dfa03c0910daf
# Parent  6454364c25cf1c1cc58e2cfb079ed97024f63f61# Parent  2f2aae1d394c9e536c8989f63d4f6251b11a0006
merged

diff -r 6454364c25cf -r 29dc0658b75d .emacs
--- a/.emacs	Wed Oct 14 17:20:45 2009 +0300
+++ b/.emacs	Sun Oct 18 21:58:22 2009 +0300
@@ -8,14 +8,9 @@
 
 ;; ======================================================================
 ;; Load path.
-(defvar my-el-dir
-  (expand-file-name "~/.el")
-  "Here live additional lisp packages.")
 (defvar my-usr-el-dir
   (expand-file-name "~/usr/share/emacs/site-lisp")
   "Here live additional lisp packages.")
-
-(add-to-list 'load-path my-el-dir)
 (add-to-list 'load-path my-usr-el-dir)
 
 (defvar dot-emacs-pre (expand-file-name "~/.emacs-pre")
diff -r 6454364c25cf -r 29dc0658b75d .emacs-my
--- a/.emacs-my	Wed Oct 14 17:20:45 2009 +0300
+++ b/.emacs-my	Sun Oct 18 21:58:22 2009 +0300
@@ -73,7 +73,7 @@
 ;; (desktop-read)
 
 ;; ======================================================================
-;; Standart settings
+;; standart/general settings
 
 (setq kill-whole-line t)
 
@@ -88,6 +88,8 @@
 ;; Always end a file with a newline.
 ;; (setq require-final-newline t)
 
+(setq read-quoted-char-radix 16)
+
 ;; ----------------------------------------------------------------------
 ;; Switching, creating, selecting buffers.
 (iswitchb-mode 1)
@@ -751,18 +753,6 @@
 ;; (setq-default vc-svn-register-switches "--encoding cp1251")
 (setq-default vc-svn-register-switches nil)
 
-(setq my-svn-dir (concat my-el-dir "/svn"))
-(if (file-exists-p my-svn-dir)
-    (progn
-      (add-to-list 'load-path my-svn-dir)
-      (require 'vc-svn)
-      )
-  )
-
-(if (file-exists-p (concat my-el-dir "/mercurial.el"))
-    (require 'mercurial)
-  )
-
 (if window-system
     (progn
      (custom-set-variables
@@ -827,11 +817,11 @@
 (setq-default indent-tabs-mode nil)     ; t - будут вставляться \t
 (setq tab-always-indent t)
 (setq c-tab-always-indent t)
-(let ( (line-width 400) )
-  (setq i (+ (/ line-width 4) 1))
+(let (i (line-width 200))
+  (setq i (* (/ line-width tab-width) tab-width))
   (setq tab-stop-list nil)
-  (while (> (setq i (- i 1)) 0)
-    (setq tab-stop-list (cons (* i 4) tab-stop-list))))
+  (while (>= (setq i (- i tab-width)) 0)
+    (setq tab-stop-list (cons i tab-stop-list))))
 
 ;; ----------------------------------------------------------------------
 ;; Diff.