[Emacs-diffs] Changes to emacs/lisp/jka-compr.el

[Juanma Barranquero]

Index: emacs/lisp/jka-compr.el
diff -c emacs/lisp/jka-compr.el:1.74 emacs/lisp/jka-compr.el:1.75
*** emacs/lisp/jka-compr.el:1.74        Fri Jan 24 08:28:24 2003
--- emacs/lisp/jka-compr.el     Tue Feb  4 06:31:40 2003
***************
*** 77,85 ****
  
  
  ;; ACKNOWLEDGMENTS
! ;; 
  ;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs.  Many people
! ;; have made helpful suggestions, reported bugs, and even fixed bugs in 
  ;; jka-compr.  I recall the following people as being particularly helpful.
  ;;
  ;;   Jean-loup Gailly
--- 77,85 ----
  
  
  ;; ACKNOWLEDGMENTS
! ;;
  ;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs.  Many people
! ;; have made helpful suggestions, reported bugs, and even fixed bugs in
  ;; jka-compr.  I recall the following people as being particularly helpful.
  ;;
  ;;   Jean-loup Gailly
***************
*** 117,123 ****
    :type 'string
    :group 'jka-compr)
  
! (defvar jka-compr-use-shell 
    (not (memq system-type '(ms-dos windows-nt))))
  
  ;;; I have this defined so that .Z files are assumed to be in unix
--- 117,123 ----
    :type 'string
    :group 'jka-compr)
  
! (defvar jka-compr-use-shell
    (not (memq system-type '(ms-dos windows-nt))))
  
  ;;; I have this defined so that .Z files are assumed to be in unix
***************
*** 270,277 ****
  
    (signal 'compression-error
          (list "Opening input file" (format "error %s" message) infile)))
!                       
!    
  (defcustom jka-compr-dd-program "/bin/dd"
    "How to invoke `dd'."
    :type 'string
--- 270,277 ----
  
    (signal 'compression-error
          (list "Opening input file" (format "error %s" message) infile)))
! 
! 
  (defcustom jka-compr-dd-program "/bin/dd"
    "How to invoke `dd'."
    :type 'string
***************
*** 447,453 ****
  
            (setq temp-file (jka-compr-make-temp-name)))
  
!         (and 
           compress-message
           (message "%s %s..." compress-message base-name))
  
--- 447,453 ----
  
            (setq temp-file (jka-compr-make-temp-name)))
  
!         (and
           compress-message
           (message "%s %s..." compress-message base-name))
  
***************
*** 502,508 ****
          (setq last-coding-system-used coding-system-used)
  
          nil)
!             
        (jka-compr-run-real-handler 'write-region
                                  (list start end filename append visit)))))
  
--- 502,508 ----
          (setq last-coding-system-used coding-system-used)
  
          nil)
! 
        (jka-compr-run-real-handler 'write-region
                                  (list start end filename append visit)))))
  
***************
*** 538,544 ****
          (unwind-protect               ; to make sure local-copy gets deleted
  
              (progn
!                 
                (and
                 uncompress-message
                 (message "%s %s..." uncompress-message base-name))
--- 538,544 ----
          (unwind-protect               ; to make sure local-copy gets deleted
  
              (progn
! 
                (and
                 uncompress-message
                 (message "%s %s..." uncompress-message base-name))
***************
*** 583,589 ****
                            (eq (nth 3 error-code) local-file))
                       (if visit
                           (setq notfound error-code)
!                        (signal 'file-error 
                                 (cons "Opening input file"
                                       (nthcdr 2 error-code))))
                     (signal (car error-code) (cdr error-code))))))
--- 583,589 ----
                            (eq (nth 3 error-code) local-file))
                       (if visit
                           (setq notfound error-code)
!                        (signal 'file-error
                                 (cons "Opening input file"
                                       (nthcdr 2 error-code))))
                     (signal (car error-code) (cdr error-code))))))
***************
*** 594,600 ****
             (delete-file local-copy)))
  
          (decode-coding-inserted-region
!          (point) (+ (point) size) 
           (jka-compr-byte-compiler-base-file-name file)
           visit beg end replace)
  
--- 594,600 ----
             (delete-file local-copy)))
  
          (decode-coding-inserted-region
!          (point) (+ (point) size)
           (jka-compr-byte-compiler-base-file-name file)
           visit beg end replace)
  
***************
*** 605,611 ****
             (setq buffer-file-name filename)
             (setq jka-compr-really-do-compress t)
             (set-visited-file-modtime)))
!           
          (and
           uncompress-message
           (message "%s %s...done" uncompress-message base-name))
--- 605,611 ----
             (setq buffer-file-name filename)
             (setq jka-compr-really-do-compress t)
             (set-visited-file-modtime)))
! 
          (and
           uncompress-message
           (message "%s %s...done" uncompress-message base-name))
***************
*** 661,671 ****
          (unwind-protect
  
              (with-current-buffer temp-buffer
!                 
                (and
                 uncompress-message
                 (message "%s %s..." uncompress-message base-name))
!                 
                ;; Here we must read the output of uncompress program
                ;; and write it to TEMP-FILE without any code
                ;; conversion.  An appropriate code conversion (if
--- 661,671 ----
          (unwind-protect
  
              (with-current-buffer temp-buffer
! 
                (and
                 uncompress-message
                 (message "%s %s..." uncompress-message base-name))
! 
                ;; Here we must read the output of uncompress program
                ;; and write it to TEMP-FILE without any code
                ;; conversion.  An appropriate code conversion (if
***************
*** 697,703 ****
            (kill-buffer temp-buffer))
  
          temp-file)
!           
        (jka-compr-run-real-handler 'file-local-copy (list filename)))))
  
  
--- 697,703 ----
            (kill-buffer temp-buffer))
  
          temp-file)
! 
        (jka-compr-run-real-handler 'file-local-copy (list filename)))))
  
  
***************
*** 865,871 ****
                   (eq (nth 2 entry) 'jka-compr)))
          (setcdr last (cdr (cdr last)))
        (setq last (cdr last))))
!     
      (setq auto-mode-alist (cdr ama)))
  
    (let* ((ama (cons nil file-coding-system-alist))
--- 865,871 ----
                   (eq (nth 2 entry) 'jka-compr)))
          (setcdr last (cdr (cdr last)))
        (setq last (cdr last))))
! 
      (setq auto-mode-alist (cdr ama)))
  
    (let* ((ama (cons nil file-coding-system-alist))
***************
*** 877,883 ****
        (if (member entry jka-compr-added-to-file-coding-system-alist)
          (setcdr last (cdr (cdr last)))
        (setq last (cdr last))))
!     
      (setq file-coding-system-alist (cdr ama)))
  
    ;; Remove the suffixes that were added by jka-compr.
--- 877,883 ----
        (if (member entry jka-compr-added-to-file-coding-system-alist)
          (setcdr last (cdr (cdr last)))
        (setq last (cdr last))))
! 
      (setq file-coding-system-alist (cdr ama)))
  
    ;; Remove the suffixes that were added by jka-compr.
***************
*** 888,894 ****
        (push suffix suffixes)))
      (setq load-suffixes (nreverse suffixes))))
  
!       
  (defun jka-compr-installed-p ()
    "Return non-nil if jka-compr is installed.
  The return value is the entry in `file-name-handler-alist' for jka-compr."
--- 888,894 ----
        (push suffix suffixes)))
      (setq load-suffixes (nreverse suffixes))))
  
! 
  (defun jka-compr-installed-p ()
    "Return non-nil if jka-compr is installed.
  The return value is the entry in `file-name-handler-alist' for jka-compr."