Merge from origin/emacs-25

[gnu-emacs] / lisp / vc / ediff-util.el

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index eb5c2490a7e87f3ecabd4086fdd29bf2d46b4716..c12602c71508a0733f2dfc2d0c4abe20624617ce 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1141,11 +1141,8 @@ of the current buffer."
        ))
 
 (defun ediff-file-compressed-p (file)
-  (condition-case nil
-      (require 'jka-compr)
-    (error))
-  (if (featurep 'jka-compr)
-      (string-match (jka-compr-build-file-regexp) file)))
+  (require 'jka-compr)
+  (string-match (jka-compr-build-file-regexp) file))
 
 
 (defun ediff-swap-buffers ()