From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Ivan Zakharyaschev Newsgroups: gmane.emacs.devel Subject: the '-c'-check in ediff-diff.el too strict (patch; 21.2 & HEAD) Date: Mon, 18 Nov 2002 00:12:45 +0300 (MSK) Sender: emacs-devel-admin@gnu.org Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323328-504793657-1037567565=:1468" X-Trace: main.gmane.org 1037569976 18799 80.91.224.249 (17 Nov 2002 21:52:56 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sun, 17 Nov 2002 21:52:56 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18DXLa-0004sx-00 for ; Sun, 17 Nov 2002 22:52:54 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18DXNT-00045U-00 for ; Sun, 17 Nov 2002 22:54:51 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10) id 18DXKs-0000s0-00; Sun, 17 Nov 2002 16:52:10 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10) id 18DWxb-0004XT-00 for emacs-devel@gnu.org; Sun, 17 Nov 2002 16:28:07 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10) id 18DWxV-0004WR-00 for emacs-devel@gnu.org; Sun, 17 Nov 2002 16:28:05 -0500 Original-Received: from dialup10.radio-msu.net ([213.252.119.250] helo=arrakis.zephyrous) by monty-python.gnu.org with esmtp (Exim 4.10) id 18DWxS-0004VY-00 for emacs-devel@gnu.org; Sun, 17 Nov 2002 16:28:00 -0500 Original-Received: from localhost (IDENT:ivan@arrakis.zephyrous [127.0.0.1]) by arrakis.zephyrous (8.12.3/8.8.7) with ESMTP id gAHLCkDG003805; Mon, 18 Nov 2002 00:12:46 +0300 X-X-Sender: ivan@arrakis.zephyrous Original-To: emacs-devel@gnu.org, Michael Kifer X-Mailer: try to guess Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.devel:9499 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:9499 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --8323328-504793657-1037567565=:1468 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 --8323328-504793657-1037567565=:1468 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="emacs-21.2-ediff-diff-options-check-c.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: refine the cjeck for '-c' Content-Disposition: attachment; filename="emacs-21.2-ediff-diff-options-check-c.patch" UmVmaW5lIHRoZSByZWdleHAgZm9yIGNoZWNraW5nIHRoZSBvcHRpb25zIGFn YWluc3QgJy1jJyBvcHRpb24NCnRvIGRpZmY7IG1ha2UgaXQgKm5vdCogbWF0 Y2ggc210aCBsaWtlIA0KIi0taWdub3JlLXNwYWNlLWNoYW5nZSAtLWlnbm9y ZS1ibGFuay1saW5lcyIuDQoNCmltekBhbHRsaW51eC5ydSwgTm92IDIwMDIu DQoNCi0tLSAyMS4yL2xpc3AvZWRpZmYtZGlmZi5lbC5jaGVjay1jCTIwMDIt MTEtMTcgMjM6NDY6MDUgKzAzMDANCisrKyAyMS4yL2xpc3AvZWRpZmYtZGlm Zi5lbAkyMDAyLTExLTE3IDIzOjU4OjI2ICswMzAwDQpAQCAtMjIzLDcgKzIy Myw3IEBADQogOzsgZWRpZmYtc2V0dXAtZGlmZi1yZWdpb25zLWZ1bmN0aW9u LCB3aGljaCBjYW4gYWxzbyBoYXZlIHRoZSB2YWx1ZQ0KIDs7IGVkaWZmLXNl dHVwLWRpZmYtcmVnaW9uczMsIHdoaWNoIHRha2VzIDQgYXJndW1lbnRzLg0K IChkZWZ1biBlZGlmZi1zZXR1cC1kaWZmLXJlZ2lvbnMgKGZpbGUtQSBmaWxl LUIgZmlsZS1DKQ0KLSAgKGlmIChzdHJpbmctbWF0Y2ggImMiIGVkaWZmLWRp ZmYtb3B0aW9ucykNCisgIChpZiAoc3RyaW5nLW1hdGNoICJcXCheXFx8W1s6 c3BhY2U6XV1cXCktW14tXSpjIiBlZGlmZi1kaWZmLW9wdGlvbnMpDQogICAg ICAgKGVycm9yICJPcHRpb24gYC1jJyBpcyBub3QgYWxsb3dlZCBpbiBgZWRp ZmYtZGlmZi1vcHRpb25zJyIpKQ0KIAkJCQkJCSAgDQogICA7OyBjcmVhdGUs IGlmIGl0IGRvZXNuJ3QgZXhpc3QNCg== --8323328-504793657-1037567565=:1468--