# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1238753928 -7200
# Node ID 318e69b9be869e152fe72a2442b27617cf1f78e0
# Parent  90fda97adcb1596451e4f03f242977f7c6f6cf00# Parent  3f6b8e1a3656f407536678cd1975ee2da53d931d
merge

diff -r 90fda97adcb1 -r 318e69b9be86 .emacs-my
--- a/.emacs-my	Fri Feb 06 11:58:14 2009 +0200
+++ b/.emacs-my	Fri Apr 03 12:18:48 2009 +0200
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2008 by Oleksandr Gavenko <gavenkoa@gmail.com>
 ;;
-;; This file formed from parts from many places and
+;; This file formed from parts and ideas from many sites/docs and
 ;; placed in public domain.
 ;;
 ;; .emacs file for GNU Emacs.
@@ -88,13 +88,23 @@
 
 (setq view-read-only t)
 
+(setq frame-title-format "Emacs - %b")
+
 ;; ----------------------------------------------------------------------
 ;; Switching, creating, selecting buffers.
 (iswitchb-mode 1)
-(setq iswitchb-buffer-ignore '("^ "))
-(add-to-list 'iswitchb-buffer-ignore "^\*Buffer")
-(add-to-list 'iswitchb-buffer-ignore "^\*Completions\*")
-(add-to-list 'iswitchb-buffer-ignore "^\*Quail Completions\*")
+(setq iswitchb-buffer-ignore nil)
+(mapc (lambda (arg) (add-to-list 'iswitchb-buffer-ignore arg))
+        '("^ "
+          "^\*Buffer"
+          "^\*Completions\*"
+          "^\*tramp"
+          "^\*Dired log\*"
+          "^\*Help\*"
+          "^\*Quail Completions\*"
+          "^\*Disabled Command\*"
+          "^\*vc\*"
+          ))
 
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'post-forward)
@@ -104,12 +114,19 @@
 ;; ----------------------------------------------------------------------
 ;; Scrolling
 
-;; гладкий скроллинг с полями
-;; (setq-default scroll-conservatively 70)
-;; (setq-default scroll-preserve-screen-position 't)
-;; при перемещении точка останавливается на расстоянии i строк к границе фрейма,
-;; далее скроллиться текст
-;; (setq scroll-margin 2)
+(setq-default
+ ;; 2 - default value
+ next-screen-context-lines 2
+ ;; The number of lines to try scrolling a window by when point moves out.
+ scroll-step 1
+ scroll-conservatively 100
+ ;; при перемещении точка останавливается на расстоянии i строк к границе фрейма,
+ scroll-margin 2
+ scroll-preserve-screen-position t
+ )
+
+;; ----------------------------------------------------------------------
+;; fringe-mode
 
 ;; ----------------------------------------------------------------------
 ;; *Text*
@@ -192,7 +209,6 @@
 (global-set-key [f7] 'occur)            ; Key binding as in mc
 
 ;; frames, windows manipulation, switch buffers
-(global-set-key [C-tab]      'other-window)
 (global-set-key [?\C-x right] 'next-buffer)
 (global-set-key [?\C-x left]  'previous-buffer)
 
@@ -364,7 +380,8 @@
 
 ;; Also useful such format:
 ;; (setq display-time-format " %H:%M %d-%m-%y ")
-(setq display-time-24hr-format 0)
+(setq display-time-24hr-format t)
+(setq display-time-default-load-average nil)
 (display-time)
 
 ;; ----------------------------------------------------------------------
@@ -695,6 +712,7 @@
           jabber-use-global-history nil
           jabber-backlog-number 15
           jabber-backlog-days 30
+          jabber-alert-presence-message-function (lambda (who oldstatus newstatus statustext) nil)
           )
   )