(jka-compr-insert-file-contents):

Special handling if cannot find the uncompression program.

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index ca5e158349d376c1d773105a26899fe720c04552..f282957512c232213ffa190ec1355ab3657c4e32 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -474,6 +474,9 @@ There should be no more than seven characters after the final `/'."
                          (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
@@ -481,6 +484,13 @@ There should be no more than seven characters after the final `/'."
                         (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