summaryrefslogtreecommitdiff
path: root/lisp/ediff-diff.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-03-05 08:48:29 +0000
committerGlenn Morris <rgm@gnu.org>2008-03-05 08:48:29 +0000
commitdc3fbc6a364ccb6a828a6b884f96342701ae23dd (patch)
tree48269b55d759e477a1ccb65dcaf51ff17a0dd06c /lisp/ediff-diff.el
parent03365d0eb5c09d346c56437912a4ddd9b0884ac9 (diff)
downloademacs-dc3fbc6a364ccb6a828a6b884f96342701ae23dd.tar.gz
Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
Diffstat (limited to 'lisp/ediff-diff.el')
-rw-r--r--lisp/ediff-diff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index b690bfbe4e1..00060a9e974 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -1311,7 +1311,7 @@ These characters are ignored when differing regions are split into words.")
(make-variable-buffer-local 'ediff-whitespace)
(defvar ediff-word-1
- (ediff-cond-compile-for-xemacs-or-emacs "a-zA-Z---_" "-[:word:]_")
+ (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_")
"*Characters that constitute words of type 1.
More precisely, [ediff-word-1] is a regexp that matches type 1 words.
See `ediff-forward-word' for more details.")