--- a/.emacs-my	Tue Feb 28 21:05:40 2012 +0200
+++ b/.emacs-my	Fri Apr 06 20:05:16 2012 +0300
@@ -793,7 +793,7 @@
     "\\(?:^#.*#\\|~\\|^.?\\.diff\\|"
     "\\." (regexp-opt '("base" "local" "orig" "other" "log" "stackdump" "rej"))
     "\\)\\'")
-   (file-name-nondirectory file)))
+   (or (and (file-directory-p file) "") (file-name-nondirectory file))))
 
 (defun my-dired-flag-tmp-files ()
   "Flag all temporary files for deletion."