User: michaelk Date: 06/02/22 07:52:35 Modified: packages/xemacs-packages/ediff ediff-diff.el ChangeLog Log: * ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3): fix the regular expressions. Revision Changes Path 1.28 +3 -2 XEmacs/packages/xemacs-packages/ediff/ediff-diff.el Index: ediff-diff.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-diff.el,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ediff-diff.el 2006/02/19 03:35:19 1.27 +++ ediff-diff.el 2006/02/22 06:52:34 1.28 ＠＠ -251,7 +251,8 ＠＠ one optional arguments, diff-number to r ;; 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) 1.102 +5 -0 XEmacs/packages/xemacs-packages/ediff/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -u -p -r1.101 -r1.102 --- ChangeLog 2006/02/20 07:25:02 1.101 +++ ChangeLog 2006/02/22 06:52:34 1.102 ＠＠ -1,3 +1,8 ＠＠ +2006-02-21 Michael Kifer <kifer(a)cs.stonybrook.edu&gt; + + * ediff-diff.el (ediff-setup-diff-regions, ediff-setup-diff-regions3): + fix the regular expressions. + 2006-02-20 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.61 released.