Mercurial > emacs
diff lisp/ediff-diff.el @ 48371:1b4ba54b52de
2002-11-17 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-setup-diff-regions): change regexp.
* ediff-mult.el: comments.
* ediff.el: comments.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 17 Nov 2002 22:26:48 +0000 |
| parents | bd315b9fa3f0 |
| children | 37645a051842 |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Sun Nov 17 22:24:42 2002 +0000 +++ b/lisp/ediff-diff.el Sun Nov 17 22:26:48 2002 +0000 @@ -225,7 +225,8 @@ ;; ediff-setup-diff-regions-function, which can also have the value ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) - (if (string-match "c" ediff-diff-options) + ;; looking either for '-c' or a 'c' in a set of clustered non-long options + (if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options) (error "Option `-c' is not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist