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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5d87562709bbbed94d1bc5a8f2ebaaa7eafe114..c032b424366b78d95a17712bfe600adc6b9f68bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 62a6386584e2ef20b96adf36b4d7ba790da80c90..013ed9073db293d14b8fc94c69430789c3b289fc 100644 (file)
--- 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)