# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1287668012 -10800
# Node ID 01ea09b00f76c9ed7e4f53d3d10bf431b212bad7
# Parent  3f8ba1f0e12a973b7ebb688d6d82620a476cbc51# Parent  1f8c3b0b0ca3fc37939ff246369928f600064f3e
Automated merge with file:///cygdrive/d/srv/hg-home/dot-emacs

diff -r 1f8c3b0b0ca3 -r 01ea09b00f76 .emacs-my
--- a/.emacs-my	Thu Oct 21 16:06:36 2010 +0300
+++ b/.emacs-my	Thu Oct 21 16:33:32 2010 +0300
@@ -516,8 +516,6 @@
   "Flag all temporary files for deletion."
   (interactive)
   (dired-mark-if
-   ;; (let ( (fn (dired-get-filename)) )
-   ;;   (if fn (backup-file-name-p fn)))
    (let ( (fn (dired-get-filename 'verbatim t)) )
      (and fn (my-file-name-tmp-p fn)) )
    "backup file"