[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 247e041: No need to test for jka-compr
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 247e041: No need to test for jka-compr |
Date: |
Sat, 30 Apr 2016 00:38:34 +0000 |
branch: master
commit 247e0411a3131c6b6d83ff42c59aafb9ed686c04
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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 eb5c249..c12602c 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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 247e041: No need to test for jka-compr,
Lars Ingebrigtsen <=