X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ab422c4d6899b1442cb6954c1829c1fb656b006c..d43b5e84066afe4ee7100ab957438a1c41141492:/lisp/jka-compr.el

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index ac81cf0d52..a6896053e5 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,10 +1,9 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
-;; Copyright (C) 1993-1995, 1997, 1999-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2014 Free Software Foundation, Inc.
 
-;; Author: jka@ece.cmu.edu (Jay K. Adams)
-;; Maintainer: FSF
+;; Author: Jay K. Adams <jka@ece.cmu.edu>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: data
 
 ;; This file is part of GNU Emacs.
@@ -109,8 +108,7 @@ data appears to be compressed already.")
 (put 'jka-compr-really-do-compress 'permanent-local t)
 
 
-(put 'compression-error 'error-conditions '(compression-error file-error error))
-
+(define-error 'compression-error nil 'file-error)
 
 (defvar jka-compr-acceptable-retval-list '(0 2 141))
 
@@ -332,8 +330,6 @@ There should be no more than seven characters after the final `/'."
 
 	  (with-current-buffer temp-buffer
 	    (let ((coding-system-for-write 'no-conversion))
-	      (if (memq system-type '(ms-dos windows-nt))
-		  (setq buffer-file-type t) )
 	      (jka-compr-run-real-handler 'write-region
 					  (list (point-min) (point-max)
 						filename