diff options
Diffstat (limited to 'lisp/jka-compr.el')
| -rw-r--r-- | lisp/jka-compr.el | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 8258ab32495..c4643fb2d8c 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el | |||
| @@ -471,22 +471,21 @@ There should be no more than seven characters after the final `/'." | |||
| 471 | ;; If the file we wanted to uncompress does not exist, | 471 | ;; If the file we wanted to uncompress does not exist, |
| 472 | ;; handle that according to VISIT as `insert-file-contents' | 472 | ;; handle that according to VISIT as `insert-file-contents' |
| 473 | ;; would, maybe signaling the same error it normally would. | 473 | ;; would, maybe signaling the same error it normally would. |
| 474 | (if (and (eq (car error-code) 'file-missing) | 474 | (if (and (error-has-type-p error-code 'file-missing) |
| 475 | (eq (nth 3 error-code) local-file)) | 475 | (eq (error-slot-value error-code 3) local-file)) |
| 476 | (if visit | 476 | (if visit |
| 477 | (setq notfound error-code) | 477 | (setq notfound error-code) |
| 478 | (signal 'file-missing | 478 | (setf (error-slot-value error-code 1) |
| 479 | (cons "Opening input file" | 479 | "Opening input file") |
| 480 | (nthcdr 2 error-code)))) | 480 | (signal error-code)) |
| 481 | ;; If the uncompression program can't be found, | 481 | ;; If the uncompression program can't be found, |
| 482 | ;; signal that as a non-file error | 482 | ;; signal that as a non-file error |
| 483 | ;; so that find-file-noselect-1 won't handle it. | 483 | ;; so that find-file-noselect-1 won't handle it. |
| 484 | (if (and (memq 'file-error (get (car error-code) | 484 | (if (and (error-has-type-p error-code 'file-error) |
| 485 | 'error-conditions)) | ||
| 486 | (equal (cadr error-code) "Searching for program")) | 485 | (equal (cadr error-code) "Searching for program")) |
| 487 | (error "Uncompression program `%s' not found" | 486 | (error "Uncompression program `%s' not found" |
| 488 | (nth 3 error-code))) | 487 | (error-slot-value error-code 3)) |
| 489 | (signal (car error-code) (cdr error-code))))))) | 488 | (signal error-code))))))) |
| 490 | 489 | ||
| 491 | (and | 490 | (and |
| 492 | local-copy | 491 | local-copy |