* the '-c'-check in ediff-diff.el too strict (patch; 21.2 & HEAD) @ 2002-11-17 21:12 ` Ivan Zakharyaschev 2002-11-17 22:31 ` Michael Kifer 0 siblings, 1 reply; 2+ messages in thread From: Ivan Zakharyaschev @ 2002-11-17 21:12 UTC (permalink / raw) [-- Attachment #1: Type: TEXT/PLAIN, Size: 562 bytes --] Hello! I'm running emacs 21.2 and have set: ediff-diff-options's value is "--ignore-space-change --ignore-blank-lines" and when I run ediff-buffers, it says: ediff-setup-diff-regions: Option `-c' is not allowed in `ediff-diff-options' The attached patch fixes the problem: it refines the regexp for the check. I had a look into the CVS of Emacs, it looks like this is not yet fixed in the HEAD either. Regards, -- Ivan Zakharyaschev ALT Linux Team member I'm a Sisyphus developer: it's core is GNU/Linux http://www.altlinux.ru, http://www.altlinux.com [-- Attachment #2: refine the cjeck for '-c' --] [-- Type: TEXT/PLAIN, Size: 742 bytes --] Refine the regexp for checking the options against '-c' option to diff; make it *not* match smth like "--ignore-space-change --ignore-blank-lines". imz@altlinux.ru, Nov 2002. --- 21.2/lisp/ediff-diff.el.check-c 2002-11-17 23:46:05 +0300 +++ 21.2/lisp/ediff-diff.el 2002-11-17 23:58:26 +0300 @@ -223,7 +223,7 @@ ;; ediff-setup-diff-regions-function, which can also have the value ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) - (if (string-match "c" ediff-diff-options) + (if (string-match "\\(^\\|[[:space:]]\\)-[^-]*c" ediff-diff-options) (error "Option `-c' is not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: the '-c'-check in ediff-diff.el too strict (patch; 21.2 & HEAD) 2002-11-17 21:12 ` the '-c'-check in ediff-diff.el too strict (patch; 21.2 & HEAD) Ivan Zakharyaschev @ 2002-11-17 22:31 ` Michael Kifer 0 siblings, 0 replies; 2+ messages in thread From: Michael Kifer @ 2002-11-17 22:31 UTC (permalink / raw) Cc: emacs-devel Ivan, Thanks for the fix. Incidentally, the same problem was reported about a month ago. I changed it in my sources, but didn't commit until today. Michael Kifer kifer@cs.stonybrook.edu > Hello! > > I'm running emacs 21.2 and have set: > > ediff-diff-options's value is > "--ignore-space-change --ignore-blank-lines" > > and when I run ediff-buffers, it says: > > ediff-setup-diff-regions: Option `-c' is not allowed in > `ediff-diff-options' > > The attached patch fixes the problem: it refines the regexp for the > check. I had a look into the CVS of Emacs, it looks like this is not > yet fixed in the HEAD either. > > Regards, > > > -- > Ivan Zakharyaschev > ALT Linux Team member > I'm a Sisyphus developer: it's core is GNU/Linux > http://www.altlinux.ru, http://www.altlinux.com ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-11-17 22:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <imz@altlinux.org>
2002-11-17 21:12 ` the '-c'-check in ediff-diff.el too strict (patch; 21.2 & HEAD) Ivan Zakharyaschev
2002-11-17 22:31 ` Michael Kifer
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).