[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-diff.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-diff.el |
Date: |
Wed, 22 Feb 2006 06:50:19 +0000 |
Index: emacs/lisp/ediff-diff.el
diff -u emacs/lisp/ediff-diff.el:1.50 emacs/lisp/ediff-diff.el:1.51
--- emacs/lisp/ediff-diff.el:1.50 Sun Feb 19 03:16:44 2006
+++ emacs/lisp/ediff-diff.el Wed Feb 22 06:50:17 2006
@@ -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)