aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff-diff.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-diff.el')
-rw-r--r--lisp/ediff-diff.el5
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.")
251;; ediff-setup-diff-regions3, which takes 4 arguments. 251;; ediff-setup-diff-regions3, which takes 4 arguments.
252(defun ediff-setup-diff-regions (file-A file-B file-C) 252(defun ediff-setup-diff-regions (file-A file-B file-C)
253 ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options 253 ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options
254 (if (string-match "^-[ci]\\| -[ci]\\|-[^- ]+[ci]" ediff-diff-options) 254 (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]"
255 ediff-diff-options)
255 (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'")) 256 (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'"))
256 257
257 ;; create, if it doesn't exist 258 ;; create, if it doesn't exist
@@ -1215,7 +1216,7 @@ delimiter regions"))
1215;; or it is the ancestor file. 1216;; or it is the ancestor file.
1216(defun ediff-setup-diff-regions3 (file-A file-B file-C) 1217(defun ediff-setup-diff-regions3 (file-A file-B file-C)
1217 ;; looking for '-i' or a 'i' among clustered non-long options 1218 ;; looking for '-i' or a 'i' among clustered non-long options
1218 (if (string-match "^-i\\| -i\\|-[^- ]+i" ediff-diff-options) 1219 (if (string-match "^-i\\| -i\\|\\(^\\| \\)-[^- ]+i" ediff-diff-options)
1219 (error "Option `-i' is not allowed in `ediff-diff3-options'")) 1220 (error "Option `-i' is not allowed in `ediff-diff3-options'"))
1220 1221
1221 (or (ediff-buffer-live-p ediff-diff-buffer) 1222 (or (ediff-buffer-live-p ediff-diff-buffer)