From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.cc-mode.general,gmane.emacs.devel Subject: Re: Fwd: problems with smerge-mode.el Date: Fri, 16 Dec 2005 15:00:41 -0500 Message-ID: <87bqzgq0i7.fsf-monnier+emacs@gnu.org> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1134763480 26244 80.91.229.2 (16 Dec 2005 20:04:40 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 16 Dec 2005 20:04:40 +0000 (UTC) Cc: emacs-devel@gnu.org, bug-cc-mode@gnu.org, rms@gnu.org Original-X-From: cc-mode-help-admin@lists.sourceforge.net Fri Dec 16 21:04:37 2005 Return-path: Original-Received: from lists-outbound.sourceforge.net ([66.35.250.225]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EnLmE-0006V1-1b for sf-cc-mode-help@m.gmane.org; Fri, 16 Dec 2005 21:02:02 +0100 Original-Received: from sc8-sf-list1-b.sourceforge.net (sc8-sf-list1-b.sourceforge.net [10.3.1.7]) by sc8-sf-spam1.sourceforge.net (Postfix) with ESMTP id 4CFA58881C; Fri, 16 Dec 2005 12:02:01 -0800 (PST) Original-Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1EnLlE-0000um-5w for cc-mode-help@lists.sourceforge.net; Fri, 16 Dec 2005 12:01:00 -0800 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by mail.sourceforge.net with esmtps (TLSv1:DES-CBC3-SHA:168) (Exim 4.44) id 1EnLlA-0005Yi-Nq for cc-mode-help@lists.sourceforge.net; Fri, 16 Dec 2005 12:01:00 -0800 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org with esmtp (Exim 4.34) id 1EnLjW-0008Ox-62 for bug-cc-mode@gnu.org; Fri, 16 Dec 2005 14:59:14 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.34) id 1EnLo9-0005HR-JI for bug-cc-mode@gnu.org; Fri, 16 Dec 2005 15:04:04 -0500 Original-Received: from [209.226.175.54] (helo=tomts10-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EnLo9-0005Gu-8I; Fri, 16 Dec 2005 15:04:01 -0500 Original-Received: from alfajor ([65.92.242.250]) by tomts10-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20051216200041.KNHF14963.tomts10-srv.bellnexxia.net@alfajor>; Fri, 16 Dec 2005 15:00:41 -0500 Original-Received: by alfajor (Postfix, from userid 1000) id 92D202FD1C; Fri, 16 Dec 2005 15:00:41 -0500 (EST) Original-To: Alexandru Harsanyi In-Reply-To: (Richard M. Stallman's message of "Thu, 15 Dec 2005 12:08:31 -0500") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) X-Originating-IP: [0] X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on monty-python X-Spam-Level: X-Spam-Status: No, hits=0.1 required=5.0 tests=RCVD_IN_SORBS autolearn=no version=2.63 X-Spam-Score: 1.0 (+) X-Spam-Report: Spam Filtering performed by sourceforge.net. See http://spamassassin.org/tag/ for more details. Report problems to http://sf.net/tracker/?func=add&group_id=1&atid=200001 1.0 X_ORIG_IP_NOT_IPV4 X-Originating-IP doesn't look like IPv4 address Original-Sender: cc-mode-help-admin@lists.sourceforge.net Errors-To: cc-mode-help-admin@lists.sourceforge.net X-BeenThere: cc-mode-help@lists.sourceforge.net X-Mailman-Version: 2.0.9-sf.net Precedence: bulk List-Unsubscribe: , List-Id: Bug reports, feature requests, and general talk about CC Mode. List-Post: List-Help: List-Subscribe: , List-Archive: X-Original-Date: Fri, 16 Dec 2005 15:00:41 -0500 Xref: news.gmane.org gmane.emacs.cc-mode.general:2808 gmane.emacs.devel:47878 Archived-At: >> That's odd. I can't see any place in smerge-remove-props where the >> match-data might be clobbered. >>=20 >> And I can't reproduce your problem: M-x smerge-keep-current works just >> fine in my tests. I suspect it may be something like a bad interaction >> with an after-change-function that doesn't properly save the match data. >> Can you give a more precise recipe to reproduce the problem, starting >> from "emacs -Q"? Oh now I indeed see the problem with C++ files, but not with Elisp (or C) files. The patch below seems to fix it. I'll install it in Emacs-CVS. Alan could you make sure it either gets integrated in your upstream code or gets replaced by some other fix? Stefan --- cc-engine.el 02 d=E9c 2005 14:04:24 -0500 1.44 +++ cc-engine.el 16 d=E9c 2005 14:51:49 -0500=09 @@ -3993,6 +3993,7 @@ ;; ;; This function might do hidden buffer changes. =20 + (save-match-data (save-excursion (goto-char beg) (when (or (looking-at "[<>]") @@ -4021,7 +4022,7 @@ (while (progn (skip-chars-forward "^<>" end) (< (point) end)) (c-clear-char-property (point) 'syntax-table) - (forward-char))))))) + (forward-char)))))))) =20 ;; Dynamically bound variable that instructs `c-forward-type' to also ;; treat possible types (i.e. those that it normally returns 'maybe or ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click