* lisp/international/mule-cmds.el (read-char-by-name): Move let-binding

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

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 37c9d40ec65c3286c9feb838fb518ae2af0b2e53..ac81cf0d52d26702c1c1c657b369f2a3754b396e 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,6 +1,7 @@
 ;;; 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-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
@@ -203,6 +204,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 +311,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
@@ -341,6 +344,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 +408,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 +484,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 +540,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 +561,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 +659,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))