# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1289336013 -7200
# Node ID 41662389565859b1bc5b963b3cd5c8309476d222
# Parent  1779f42a2b2b6a238eb0ccd77befcb1c33eeab3c# Parent  d1889d3244bee363be24f071a5063856b1dd3096
Automated merge with file:///cygdrive/e/srv/hg/dot-emacs

diff -r 1779f42a2b2b -r 416623895658 .emacs-my
--- a/.emacs-my	Thu Nov 04 21:53:32 2010 +0200
+++ b/.emacs-my	Tue Nov 09 22:53:33 2010 +0200
@@ -509,7 +509,7 @@
   )
 
 (defun my-file-name-tmp-p (file)
-  (string-match "\\(^#.*#\\|~\\|\\.orig\\|\\.log\\)\\'" (file-name-nondirectory file)))
+  (string-match "\\(^#.*#\\|~\\|\\.orig\\|\\.log\\|^.?\\.diff\\)\\'" (file-name-nondirectory file)))
 
 (defun my-dired-flag-tmp-files ()
   "Flag all temporary files for deletion."