# HG changeset patch
# User "Oleksandr Gavenko <gavenkoa@gmail.com>"
# Date 1228689334 18000
# Node ID 1c9a7ccc584a7796faa68b11c555c72316e3a870
# Parent  359f03f8a64b2f23977887e1f53c0ec2e2bac0bc# Parent  def084f6e280730278b4495380c0dc90ed088646
merge

diff -r def084f6e280 -r 1c9a7ccc584a .emacs
--- a/.emacs	Sat Oct 25 19:58:35 2008 -0400
+++ b/.emacs	Sun Dec 07 17:35:34 2008 -0500
@@ -4,8 +4,17 @@
 ;;
 ;; ~/.emacs firstly load ~/.emacs-my-pre, then ~/.emacs-my, then ~/.emacs-my-post.
 
-(defvar user-el-dir (expand-file-name "~/.el")
-  "Dir where stored extensions.")
+;; ======================================================================
+;; 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-my-pre (expand-file-name "~/.emacs-my-pre")
   "Path to file with pre-loaded custom settings.")
diff -r def084f6e280 -r 1c9a7ccc584a .emacs-my
--- a/.emacs-my	Sat Oct 25 19:58:35 2008 -0400
+++ b/.emacs-my	Sun Dec 07 17:35:34 2008 -0500
@@ -21,11 +21,6 @@
 (setq debug-on-error nil)               ; t/nil
 
 ;; ======================================================================
-;; Load path.
-(setq my-el-dir (expand-file-name "~/.el"))
-(add-to-list 'load-path my-el-dir)
-
-;; ======================================================================
 ;; Настройка внешнего вида редактора.
 ;; View.
 
@@ -267,7 +262,9 @@
 (setq gc-cons-threshold 2000000)
 
 ;; Don't beep in my headphones!
-;; (setq visible-bell t) ; XXX in text terminal revert screen if press [end] or [home]
+(setq ring-bell-function '(lambda () "Empty ring-bell-function." nil))
+(setq visible-bell t) ; With default ring-bell-function in text terminal
+                      ; revert screen if press [end] or [home]
 
 ;; Prompt before evaluating local bits of lisp.  This stops people
 ;; putting things at the end of files which delete all your files!
@@ -318,7 +315,7 @@
 ;; ----------------------------------------------------------------------
 ;; *grep*
 (setq grep-command "find . -name '*' -exec grep -nH '' {} ;"
-      grep-find-command "find . -type f ! -path '*.svn*' ! -path '*CVS*' ! -path '*.hg*' -name '*' -print0 | xargs -0 -e grep -nH "
+      grep-find-command "find . '(' -name .svn -o -name CVS -o -name .hg -o -name _darcs ')' -prune -o -type f -name '*' -print0 | xargs -0 -e grep -nH "
       grep-highlight-matches nil ; do not set t because some grep do not has --color options
       grep-tree-command "find <D> <X> -type f <F> -print0 | xargs -0 -e grep <C> -nH  <R>"
       grep-use-null-device t)
@@ -663,6 +660,20 @@
        ))))))
 
 ;; ======================================================================
+;; communication
+
+;; ----------------------------------------------------------------------
+;; jabber
+(when (featurep 'jabber)
+    (setq jabber-history-enabled t
+          jabber-use-global-history nil
+          jabber-backlog-number 5
+          jabber-backlog-days 30
+          )
+  )
+
+
+;; ======================================================================
 ;; VCS, version control, cvs, svn.
 
 (if (equal window-system 'w32)
@@ -690,6 +701,13 @@
     (setq-default vc-annotate-background "white")
   )
 
+;; ----------------------------------------------------------------------
+;; DVC
+
+(when (featurep 'dvc-emacs)
+  (setq dvc-tips-enabled nil)
+  )
+
 ;; ======================================================================
 ;; Devel, prog
 
diff -r def084f6e280 -r 1c9a7ccc584a Makefile
--- a/Makefile	Sat Oct 25 19:58:35 2008 -0400
+++ b/Makefile	Sun Dec 07 17:35:34 2008 -0500
@@ -18,3 +18,9 @@
 	for file in $^; do \
 		cp $$file $(HOME)/$$file; \
 	done
+
+dist-tar:
+	tar cf dot-emacs.tar .emacs .emacs-my
+
+clean:
+	rm -f dot-emacs.tar