# HG changeset patch # User Oleksandr Gavenko # Date 1277298621 -10800 # Node ID cfc3164f3259d45228c8da7e1a24c272f70a55ee # Parent 9bc8199793b119465d060de81e7a275955016b00# Parent 5aaccf6dacd510e23239ba2765bc2e5b712e6679 Automated merge with file:///cygdrive/d/srv/hg-home/dot-emacs diff -r 9bc8199793b1 -r cfc3164f3259 .emacs-my --- a/.emacs-my Sun Jun 20 22:16:14 2010 +0300 +++ b/.emacs-my Wed Jun 23 16:10:21 2010 +0300 @@ -47,6 +47,7 @@ log-view-mode-hook diff-mode-hook dired-mode-hook + compilation-mode-hook ) "List of mode hooks for enabling scroll margin.")