From ee139ed38ba8d3b1f78c5253cd003b3d62bced3d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 26 Jun 1994 16:10:41 +0000 Subject: [PATCH] (jka-compr-partial-uncompress): Handle the case where LEN reaches to or past the end of the data. --- lisp/jka-compr.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 0b3b60dc056..3247042eb7e 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -237,9 +237,7 @@ based on the filename itself and `jka-compr-compression-info-list'." (defun jka-compr-partial-uncompress (prog message args infile beg len) "Call program PROG with ARGS args taking input from INFILE. Fourth and fifth args, BEG and LEN, specify which part of the output -to discard. All output is discarded unless it comes within LEN chars after -the BEGth char." - +to keep: LEN chars starting BEG chars from the beginning." (let* ((skip (/ beg jka-compr-dd-blocksize)) (prefix (- beg (* skip jka-compr-dd-blocksize))) (count (and len (1+ (/ (+ len prefix) jka-compr-dd-blocksize)))) @@ -267,10 +265,13 @@ the BEGth char." (jka-compr-delete-temp-file err-file)) + ;; Delete the stuff after what we want, if there is any. (and len + (< (+ start prefix len) (point)) (delete-region (+ start prefix len) (point))) + ;; Delete the stuff before what we want. (delete-region start (+ start prefix)))) -- 2.39.5