From: Michael Kifer Date: Wed, 22 Feb 2006 06:50:17 +0000 (+0000) Subject: 2006-02-21 Michael Kifer X-Git-Tag: emacs-pretest-22.0.90~3957 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=608c89a921fa0f2bf13a588f110826990446432f;p=emacs.git 2006-02-21 Michael Kifer * ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3): fix the regular expressions. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5d87562709..c032b424366 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-21 Michael Kifer + + * ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3): + fix the regular expressions. + 2006-02-21 Richard M. Stallman * 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 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)