diff options
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.") | |||
| 225 | ;; ediff-setup-diff-regions-function, which can also have the value | 225 | ;; ediff-setup-diff-regions-function, which can also have the value |
| 226 | ;; ediff-setup-diff-regions3, which takes 4 arguments. | 226 | ;; ediff-setup-diff-regions3, which takes 4 arguments. |
| 227 | (defun ediff-setup-diff-regions (file-A file-B file-C) | 227 | (defun ediff-setup-diff-regions (file-A file-B file-C) |
| 228 | (if (string-match "c" ediff-diff-options) | 228 | ;; looking either for '-c' or a 'c' in a set of clustered non-long options |
| 229 | (if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options) | ||
| 229 | (error "Option `-c' is not allowed in `ediff-diff-options'")) | 230 | (error "Option `-c' is not allowed in `ediff-diff-options'")) |
| 230 | 231 | ||
| 231 | ;; create, if it doesn't exist | 232 | ;; create, if it doesn't exist |