# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1306787556 -10800
# Node ID 7ae2454d55a6b8c1e1cf0b299fb9deec1b04016e
# Parent  97785d982806e2294ae0acdfdff92a7f7c60c690# Parent  3c123591132b312de5f60f378494f7de87471ed8
merged

diff -r 97785d982806 -r 7ae2454d55a6 .emacs-my
--- a/.emacs-my	Mon May 30 23:32:08 2011 +0300
+++ b/.emacs-my	Mon May 30 23:32:36 2011 +0300
@@ -612,7 +612,7 @@
   )
 
 (defun my-file-name-tmp-p (file)
-  (string-match "\\(^#.*#\\|~\\|\\.orig\\|\\.log\\|^.?\\.diff\\|.stackdump\\)\\'" (file-name-nondirectory file)))
+  (string-match "\\(?:^#.*#\\|~\\|\\.orig\\|\\.log\\|^.?\\.diff\\|\\.stackdump\\|\\.rej\\)\\'" (file-name-nondirectory file)))
 
 (defun my-dired-flag-tmp-files ()
   "Flag all temporary files for deletion."