From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 30 Apr 2016 00:37:26 +0000 (+0200)
Subject: No need to test for jka-compr
X-Git-Tag: emacs-26.0.90~2091
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=247e0411a3131c6b6d83ff42c59aafb9ed686c04;p=emacs.git

No need to test for jka-compr

* lisp/vc/ediff-util.el (ediff-file-compressed-p): jka-compr
is always available; no need to test (bug#18204).
---

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index eb5c2490a7e..c12602c7150 100644
--- 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 ()