From 247e0411a3131c6b6d83ff42c59aafb9ed686c04 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 30 Apr 2016 02:37:26 +0200 Subject: [PATCH] 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). --- lisp/vc/ediff-util.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 () -- 2.39.2