procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2006-02-21 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3):
	fix the regular expressions.
This commit is contained in:
Michael Kifer 2006-02-22 06:50:17 +00:00
parent a1b24e137f
commit 608c89a921
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

5
lisp/ediff-diff.el
View file

@ -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)