aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-04-30 02:37:26 +0200
committerLars Ingebrigtsen2016-04-30 02:37:26 +0200
commit247e0411a3131c6b6d83ff42c59aafb9ed686c04 (patch)
treea38a5acb4e94b099f8851f5b9b81281c75d43bd8
parenta10eb168cc96db9f0dab2d75550cbd8f08be2363 (diff)
downloademacs-247e0411a3131c6b6d83ff42c59aafb9ed686c04.tar.gz
emacs-247e0411a3131c6b6d83ff42c59aafb9ed686c04.zip
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).
-rw-r--r--lisp/vc/ediff-util.el7
1 files 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."
1141 )) 1141 ))
1142 1142
1143(defun ediff-file-compressed-p (file) 1143(defun ediff-file-compressed-p (file)
1144 (condition-case nil 1144 (require 'jka-compr)
1145 (require 'jka-compr) 1145 (string-match (jka-compr-build-file-regexp) file))
1146 (error))
1147 (if (featurep 'jka-compr)
1148 (string-match (jka-compr-build-file-regexp) file)))
1149 1146
1150 1147
1151(defun ediff-swap-buffers () 1148(defun ediff-swap-buffers ()