# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 1140591017 0
# Node ID 2b32a11ed542700a0c091c1baf5f872576bedf5f
# Parent  a25a9e239ddc11fa7d506a89fa86ec2a09b186fd
2006-02-21  Michael Kifer  <kifer@cs.stonybrook.edu>

	* ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3):
	fix the regular expressions.

diff -r a25a9e239ddc -r 2b32a11ed542 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Feb 21 23:19:40 2006 +0000
+++ b/lisp/ChangeLog	Wed Feb 22 06:50:17 2006 +0000
@@ -1,3 +1,8 @@
+2006-02-21  Michael Kifer  <kifer@cs.stonybrook.edu>
+	
+	* ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3):
+	fix the regular expressions.
+	
 2006-02-21  Richard M. Stallman  <rms@gnu.org>
 
 	* progmodes/sh-script.el (sh-mode): Set shell type based on file name
diff -r a25a9e239ddc -r 2b32a11ed542 lisp/ediff-diff.el
--- a/lisp/ediff-diff.el	Tue Feb 21 23:19:40 2006 +0000
+++ b/lisp/ediff-diff.el	Wed Feb 22 06:50:17 2006 +0000
@@ -251,7 +251,8 @@
 ;; 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 @@
 ;; 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)