X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffiles.el;h=18ce0ae17004913e22994f551a895128841bd017;hb=57bf633187a745973c8f0e0220e3aad79a83462f;hp=9bdd6d435c287407fe35dfc9f2a78722d401786f;hpb=de1ec4b272dfa3f9ef2c9ae28a9ba67170d24da5;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/files.el b/lisp/files.el
index 9bdd6d4..18ce0ae 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -198,7 +198,7 @@ nil means make them for files that have some already.
 ;(defvar dired-kept-versions 2
 ;  "*When cleaning directory, number of versions to keep.")
 
-(defcustom delete-old-versions nil
+(defcustom delete-old-versions (when noninteractive 'leave)
   "*If t, delete excess backup versions silently.
 If nil, ask confirmation.  Any other value prevents any trimming."
   :type '(choice (const :tag "Delete" t)
@@ -899,6 +899,7 @@ conversion, find-file-hooks, automatic uncompression, etc.
 	    (after-insert-file-functions nil)
 	    (coding-system-for-read 'binary)
 	    (coding-system-for-write 'binary)
+	    (jka-compr-compression-info-list nil)
 	    (find-buffer-file-type-function
 	     (if (fboundp 'find-buffer-file-type)
 		 (symbol-function 'find-buffer-file-type)
@@ -1202,7 +1203,8 @@ with the name of the interpreter specified in the first line.
 If it matches, mode MODE is selected.")
 
 (defvar binary-file-regexps
-  '("\\.\\(?:bz2\\|elc\\|g\\(if\\|z\\)\\|jp\\(eg\\|g\\)\\|png\\|t\\(ar\\|gz\\|iff\\)\\|[Zo]\\)\\'")
+  (purecopy
+   '("\\.\\(?:bz2\\|elc\\|g\\(if\\|z\\)\\|jp\\(eg\\|g\\)\\|png\\|PNG\\|t\\(ar\\|gz\\|iff\\)\\|[Zo]\\)\\'"))
   "List of regexps of filenames containing binary (non-text) data.")
 
 ;   (eval-when-compile