diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-11-17 22:26:48 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-11-17 22:26:48 +0000 |
| commit | 6dfd1bcc543f505d8bbc579c6b358744b5e7cfd6 (patch) | |
| tree | 3361e9e3e2d260207745631f527150686267fb8f /lisp/ediff-diff.el | |
| parent | d283d229dc1ca3383a1d34a8d283232ad6297f2e (diff) | |
| download | emacs-6dfd1bcc543f505d8bbc579c6b358744b5e7cfd6.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index f6c6a850329..37ac8c0e13d 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -225,7 +225,8 @@ one optional arguments, diff-number to refine.") ;; 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 |