# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1318404130 -10800
# Node ID 76342f464abefc5e0418e90749e3e5d71ddf2ba8
# Parent  7d43d5ae86fe6b509836777d276ef41d0aae7243# Parent  ff912b026ad2debd5546f9118b103c7c4bb45db4
merged

diff -r 7d43d5ae86fe -r 76342f464abe .emacs-my
--- a/.emacs-my	Tue Oct 11 23:56:53 2011 +0300
+++ b/.emacs-my	Wed Oct 12 10:22:10 2011 +0300
@@ -142,7 +142,6 @@
     recentf-dialog-mode
     org-agenda-grid-mode           ; XXX for this item not worked!
     log-view-mode
-    diff-mode
     dired-mode
     compilation-mode
     )
@@ -157,6 +156,7 @@
     text-mode
     outline-mode
     rst-mode
+    diff-mode
     dict-c5-mode
     )
   "List of text modes.")