diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-03 20:02:47 +0000 | 
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-03 20:02:47 +0000 | 
| commit | 82fb0b42f077b2c289e99579175784b57c26e58a (patch) | |
| tree | 645eae56b8219e28e4a05b14455d68e10c707c4f /lisp | |
| parent | f1a6b2163ced8440664a1e0045f7124298386d01 (diff) | |
| download | emacs-82fb0b42f077b2c289e99579175784b57c26e58a.tar.gz | |
(jka-compr-insert-file-contents): Reduce indentation slightly.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/jka-compr.el | 262 | 
1 files changed, 131 insertions, 131 deletions
| diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 4df38a3fe7b..c528e056236 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -382,137 +382,137 @@ There should be no more than seven characters after the final `/'."    (let* ((filename (expand-file-name file))  	 (info (jka-compr-get-compression-info filename))) -    (if info - -	(let ((uncompress-message (jka-compr-info-uncompress-message info)) -	      (uncompress-program (jka-compr-info-uncompress-program info)) -	      (uncompress-args (jka-compr-info-uncompress-args info)) -	      (base-name (file-name-nondirectory filename)) -	      (notfound nil) -	      (local-copy -	       (jka-compr-run-real-handler 'file-local-copy (list filename))) -	      local-file -	      size start) - -	  (setq local-file (or local-copy filename)) - -	  (and -	   visit -	   (setq buffer-file-name filename)) - -	  (unwind-protect		; to make sure local-copy gets deleted - -	      (progn - -		(and -		 uncompress-message -		 (message "%s %s..." uncompress-message base-name)) - -		(condition-case error-code - -		    (let ((coding-system-for-read 'no-conversion)) -		      (if replace -			  (goto-char (point-min))) -		      (setq start (point)) -		      (if (or beg end) -			  (jka-compr-partial-uncompress uncompress-program -							(concat uncompress-message -								" " base-name) -							uncompress-args -							local-file -							(or beg 0) -							(if (and beg end) -							    (- end beg) -							  end)) -			;; If visiting, bind off buffer-file-name so that -			;; file-locking will not ask whether we should -			;; really edit the buffer. -			(let ((buffer-file-name -			       (if visit nil buffer-file-name))) -			  (jka-compr-call-process uncompress-program -						  (concat uncompress-message -							  " " base-name) -						  local-file -						  t -						  nil -						  uncompress-args))) -		      (setq size (- (point) start)) -		      (if replace -			  (delete-region (point) (point-max))) -		      (goto-char start)) -		  (error -		   ;; If the file we wanted to uncompress does not exist, -		   ;; handle that according to VISIT as `insert-file-contents' -		   ;; would, maybe signaling the same error it normally would. -		   (if (and (eq (car error-code) 'file-error) -			    (eq (nth 3 error-code) local-file)) -		       (if visit -			   (setq notfound error-code) -			 (signal 'file-error -				 (cons "Opening input file" -				       (nthcdr 2 error-code)))) -		     ;; If the uncompression program can't be found, -		     ;; signal that as a non-file error -		     ;; so that find-file-noselect-1 won't handle it. -		     (if (and (eq (car error-code) 'file-error) -			      (equal (cadr error-code) "Searching for program")) -			 (error "Uncompression program `%s' not found" -				(nth 3 error-code))) -		     (signal (car error-code) (cdr error-code)))))) - -	    (and -	     local-copy -	     (file-exists-p local-copy) -	     (delete-file local-copy))) - -	  (unless notfound -	    (decode-coding-inserted-region -	     (point) (+ (point) size) -	     (jka-compr-byte-compiler-base-file-name file) -	     visit beg end replace)) - -	  (and -	   visit -	   (progn -	     (unlock-buffer) -	     (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)) - -	  (and -	   visit -	   notfound -	   (signal 'file-error -		   (cons "Opening input file" (nth 2 notfound)))) - -	  ;; This is done in insert-file-contents after we return. -	  ;; That is a little weird, but better to go along with it now -	  ;; than to change it now. - -;;;	  ;; Run the functions that insert-file-contents would. -;;; 	  (let ((p after-insert-file-functions) -;;; 		(insval size)) -;;; 	    (while p -;;; 	      (setq insval (funcall (car p) size)) -;;; 	      (if insval -;;; 		  (progn -;;; 		    (or (integerp insval) -;;; 			(signal 'wrong-type-argument -;;; 				(list 'integerp insval))) -;;; 		    (setq size insval))) -;;; 	      (setq p (cdr p)))) - -          (or (jka-compr-info-compress-program info) -              (message "You can't save this buffer because compression program is not defined")) - -	  (list filename size)) - -      (jka-compr-run-real-handler 'insert-file-contents -				  (list file visit beg end replace))))) +    (if (not info) + +	(jka-compr-run-real-handler 'insert-file-contents +                                    (list file visit beg end replace)) + +      (let ((uncompress-message (jka-compr-info-uncompress-message info)) +            (uncompress-program (jka-compr-info-uncompress-program info)) +            (uncompress-args (jka-compr-info-uncompress-args info)) +            (base-name (file-name-nondirectory filename)) +            (notfound nil) +            (local-copy +             (jka-compr-run-real-handler 'file-local-copy (list filename))) +            local-file +            size start) + +        (setq local-file (or local-copy filename)) + +        (and +         visit +         (setq buffer-file-name filename)) + +        (unwind-protect               ; to make sure local-copy gets deleted + +            (progn + +              (and +               uncompress-message +               (message "%s %s..." uncompress-message base-name)) + +              (condition-case error-code + +                  (let ((coding-system-for-read 'no-conversion)) +                    (if replace +                        (goto-char (point-min))) +                    (setq start (point)) +                    (if (or beg end) +                        (jka-compr-partial-uncompress uncompress-program +                                                      (concat uncompress-message +                                                              " " base-name) +                                                      uncompress-args +                                                      local-file +                                                      (or beg 0) +                                                      (if (and beg end) +                                                          (- end beg) +                                                        end)) +                      ;; If visiting, bind off buffer-file-name so that +                      ;; file-locking will not ask whether we should +                      ;; really edit the buffer. +                      (let ((buffer-file-name +                             (if visit nil buffer-file-name))) +                        (jka-compr-call-process uncompress-program +                                                (concat uncompress-message +                                                        " " base-name) +                                                local-file +                                                t +                                                nil +                                                uncompress-args))) +                    (setq size (- (point) start)) +                    (if replace +                        (delete-region (point) (point-max))) +                    (goto-char start)) +                (error +                 ;; If the file we wanted to uncompress does not exist, +                 ;; handle that according to VISIT as `insert-file-contents' +                 ;; would, maybe signaling the same error it normally would. +                 (if (and (eq (car error-code) 'file-error) +                          (eq (nth 3 error-code) local-file)) +                     (if visit +                         (setq notfound error-code) +                       (signal 'file-error +                               (cons "Opening input file" +                                     (nthcdr 2 error-code)))) +                   ;; If the uncompression program can't be found, +                   ;; signal that as a non-file error +                   ;; so that find-file-noselect-1 won't handle it. +                   (if (and (eq (car error-code) 'file-error) +                            (equal (cadr error-code) "Searching for program")) +                       (error "Uncompression program `%s' not found" +                              (nth 3 error-code))) +                   (signal (car error-code) (cdr error-code)))))) + +          (and +           local-copy +           (file-exists-p local-copy) +           (delete-file local-copy))) + +        (unless notfound +          (decode-coding-inserted-region +           (point) (+ (point) size) +           (jka-compr-byte-compiler-base-file-name file) +           visit beg end replace)) + +        (and +         visit +         (progn +           (unlock-buffer) +           (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)) + +        (and +         visit +         notfound +         (signal 'file-error +                 (cons "Opening input file" (nth 2 notfound)))) + +        ;; This is done in insert-file-contents after we return. +        ;; That is a little weird, but better to go along with it now +        ;; than to change it now. + +        ;; ;; Run the functions that insert-file-contents would. +        ;; (let ((p after-insert-file-functions) +        ;;       (insval size)) +        ;;   (while p +        ;;     (setq insval (funcall (car p) size)) +        ;;     (if insval +        ;;         (progn +        ;;           (or (integerp insval) +        ;;       	(signal 'wrong-type-argument +        ;;       		(list 'integerp insval))) +        ;;           (setq size insval))) +        ;;     (setq p (cdr p)))) + +        (or (jka-compr-info-compress-program info) +            (message "You can't save this buffer because compression program is not defined")) + +        (list filename size)))))  (defun jka-compr-file-local-copy (file) | 
