Mercurial Mercurial > dot-emacs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:///cygdrive/e/srv/hg/dot-emacs
authorOleksandr Gavenko <gavenkoa@gmail.com>
Tue, 09 Nov 2010 22:53:33 +0200
changeset 512 416623895658
parent 510 1779f42a2b2b (current diff)
parent 511 d1889d3244be (diff)
child 513 b12a3b6147f5
Automated merge with file:///cygdrive/e/srv/hg/dot-emacs
.emacs-my file | annotate | diff | comparison | revisions 
--- 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."
dot-emacs