diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-02-22 06:50:17 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-02-22 06:50:17 +0000 |
| commit | 608c89a921fa0f2bf13a588f110826990446432f (patch) | |
| tree | 2368c0635c123712b49129f45d92d31eb0ca1894 /lisp/ediff-diff.el | |
| parent | a1b24e137f75b9f5fdbd5526947a70c462c5e5bf (diff) | |
| download | emacs-608c89a921fa0f2bf13a588f110826990446432f.tar.gz | |
2006-02-21 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3):
fix the regular expressions.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 62a6386584e..013ed9073db 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -251,7 +251,8 @@ one optional arguments, diff-number to refine.") ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options - (if (string-match "^-[ci]\\| -[ci]\\|-[^- ]+[ci]" ediff-diff-options) + (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]" + ediff-diff-options) (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist @@ -1215,7 +1216,7 @@ delimiter regions")) ;; or it is the ancestor file. (defun ediff-setup-diff-regions3 (file-A file-B file-C) ;; looking for '-i' or a 'i' among clustered non-long options - (if (string-match "^-i\\| -i\\|-[^- ]+i" ediff-diff-options) + (if (string-match "^-i\\| -i\\|\\(^\\| \\)-[^- ]+i" ediff-diff-options) (error "Option `-i' is not allowed in `ediff-diff3-options'")) (or (ediff-buffer-live-p ediff-diff-buffer) |