* lisp/descr-text.el (describe-char-unicode-data): Fix copy/paste errors.

[gnu-emacs] / lisp / jka-compr.el

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 37c9d40ec65c3286c9feb838fb518ae2af0b2e53..a5556743eb341adfbcaeaed1ff77b11a49c03e0f 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,9 +1,10 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
-;; Copyright (C) 1993-1995, 1997, 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2016 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.
@@ -108,8 +109,7 @@ data appears to be compressed already.")
 (put 'jka-compr-really-do-compress 'permanent-local t)
 \f
 
-(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))
 
@@ -203,6 +203,7 @@ to keep: LEN chars starting BEG chars from the beginning."
   ;; call-process barfs if default-directory is inaccessible.
   (let ((default-directory
          (if (and default-directory
+                  (not (file-remote-p default-directory))
                   (file-accessible-directory-p default-directory))
              default-directory
            (file-name-directory infile))))
@@ -309,6 +310,7 @@ There should be no more than seven characters after the final `/'."
 
          (and
           compress-message
+          jka-compr-verbose
           (message "%s %s..." compress-message base-name))
 
          (jka-compr-run-real-handler 'write-region
@@ -329,8 +331,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
@@ -341,6 +341,7 @@ There should be no more than seven characters after the final `/'."
 
          (and
           compress-message
+          jka-compr-verbose
           (message "%s %s...done" compress-message base-name))
 
          (cond
@@ -404,6 +405,7 @@ There should be no more than seven characters after the final `/'."
 
               (and
                uncompress-message
+              jka-compr-verbose
                (message "%s %s..." uncompress-message base-name))
 
               (condition-case error-code
@@ -479,6 +481,7 @@ There should be no more than seven characters after the final `/'."
 
         (and
          uncompress-message
+        jka-compr-verbose
          (message "%s %s...done" uncompress-message base-name))
 
         (and
@@ -534,6 +537,7 @@ There should be no more than seven characters after the final `/'."
 
                (and
                 uncompress-message
+                jka-compr-verbose
                 (message "%s %s..." uncompress-message base-name))
 
                ;; Here we must read the output of uncompress program
@@ -554,6 +558,7 @@ There should be no more than seven characters after the final `/'."
 
                  (and
                   uncompress-message
+                  jka-compr-verbose
                   (message "%s %s...done" uncompress-message base-name))
 
                  (write-region
@@ -651,16 +656,15 @@ It is not recommended to set this variable permanently to anything but nil.")
 (defun jka-compr-uninstall ()
   "Uninstall jka-compr.
 This removes the entries in `file-name-handler-alist' and `auto-mode-alist'
-and `inhibit-first-line-modes-suffixes' that were added
+and `inhibit-local-variables-suffixes' that were added
 by `jka-compr-installed'."
-  ;; Delete from inhibit-first-line-modes-suffixes
-  ;; what jka-compr-install added.
+  ;; Delete from inhibit-local-variables-suffixes what jka-compr-install added.
   (mapc
      (function (lambda (x)
                 (and (jka-compr-info-strip-extension x)
-                     (setq inhibit-first-line-modes-suffixes
+                     (setq inhibit-local-variables-suffixes
                            (delete (jka-compr-info-regexp x)
-                                   inhibit-first-line-modes-suffixes)))))
+                                   inhibit-local-variables-suffixes)))))
      jka-compr-compression-info-list--internal)
 
   (let* ((fnha (cons nil file-name-handler-alist))