From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joachim Nilsson Newsgroups: gmane.emacs.devel Subject: For 23.1 release ... please. (Was: Re: lisp/progmodes/cc-styles.el indentation broken in ellemtel mode) Date: Sun, 27 Jul 2008 19:37:19 +0200 Message-ID: <488CB24F.7010707@vmlinux.org> References: <20080715124409.GA6211@vmlinux.org> <6161f3180807160825t7014be0au266dfb38ca929313@mail.gmail.com> <20080717005341.GA26458@vmlinux.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020206040608090603060506" X-Trace: ger.gmane.org 1217190285 9354 80.91.229.12 (27 Jul 2008 20:24:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 27 Jul 2008 20:24:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jul 27 22:25:33 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KNCo5-0006hV-5X for ged-emacs-devel@m.gmane.org; Sun, 27 Jul 2008 22:25:29 +0200 Original-Received: from localhost ([127.0.0.1]:38993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNCnB-0006pT-4y for ged-emacs-devel@m.gmane.org; Sun, 27 Jul 2008 16:24:33 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KNCly-00052l-I4 for emacs-devel@gnu.org; Sun, 27 Jul 2008 16:23:18 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KNClw-0004zj-Bi for emacs-devel@gnu.org; Sun, 27 Jul 2008 16:23:17 -0400 Original-Received: from [199.232.76.173] (port=46602 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNClw-0004zW-7b for emacs-devel@gnu.org; Sun, 27 Jul 2008 16:23:16 -0400 Original-Received: from vmlinux.org ([193.41.214.66]:58006) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KNClw-0003m2-1c for emacs-devel@gnu.org; Sun, 27 Jul 2008 16:23:16 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by vmlinux.org (Postfix) with ESMTP id 70541105E2 for ; Sun, 27 Jul 2008 19:37:41 +0200 (CEST) Original-Received: from vmlinux.org ([127.0.0.1]) by localhost (vmlinux [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12065-01 for ; Sun, 27 Jul 2008 19:37:13 +0200 (CEST) Original-Received: from [192.168.1.124] (90-224-114-232-no111.tbcn.telia.com [90.224.114.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by vmlinux.org (Postfix) with ESMTP id 8B90524D1 for ; Sun, 27 Jul 2008 19:37:13 +0200 (CEST) User-Agent: Thunderbird 2.0.0.16 (X11/20080724) In-Reply-To: <20080717005341.GA26458@vmlinux.org> X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at vmlinux.org X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:101591 Archived-At: This is a multi-part message in MIME format. --------------020206040608090603060506 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit PING? This patch, now with a ChangeLog entry, could be quite useful to get into the release. Regards /Jocke Joachim Nilsson wrote, on 07/17/2008 02:53 AM: > On Wed, Jul 16, 2008 at 06:25:55PM +0300, Andrew W. Nosenko wrote: > >> On Tue, Jul 15, 2008 at 3:44 PM, Joachim Nilsson wrote: >> >>> The Ellemtel C/C++ indentation engine has been broken on trunk since >>> around March. >>> >> Beside removing (arglist-cont-nonempty) from the c-offsets-alist, you >> need add it to the c-hanging-braces-alist, just like it done for all >> other styles. IMHO, current difference of "ellemtel" from an other >> styles was just a typo. >> > > Yep, that seems about right. Attached is a revised patch. > > Regards > /Jocke > --------------020206040608090603060506 Content-Type: text/plain; name="cc-styles.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="cc-styles.diff" --- lisp/ChangeLog 27 Jul 2008 02:28:46 -0000 1.14226 +++ lisp/ChangeLog 27 Jul 2008 17:32:00 -0000 @@ -1,3 +1,9 @@ +2008-07-27 Joachim Nilsson + + * progmodes/cc-styles.el: For the Ellemtel style, move + the (arglist-cont-nonempty) from c-offsets-alist to + c-hanging-braces-alist like other styles already have. + 2008-07-26 Adrian Robert * term/ns-win.el (ns-extended-platform-support-mode): Get rid of --- lisp/progmodes/cc-styles.el 6 May 2008 07:18:15 -0000 1.51 +++ lisp/progmodes/cc-styles.el 17 Jul 2008 00:45:35 -0000 @@ -162,15 +162,15 @@ ("ellemtel" (c-basic-offset . 3) (c-comment-only-line-offset . 0) - (c-hanging-braces-alist . ((substatement-open before after))) + (c-hanging-braces-alist . ((substatement-open before after) + (arglist-cont-nonempty))) (c-offsets-alist . ((topmost-intro . 0) (substatement . +) (substatement-open . 0) (case-label . +) (access-label . -) - (inclass . ++) - (inline-open . 0) - (arglist-cont-nonempty)))) + (inclass . +) + (inline-open . 0)))) ("linux" (c-basic-offset . 8) --------------020206040608090603060506 Content-Type: text/x-vcard; charset=utf-8; name="joachim_nilsson.vcf" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="joachim_nilsson.vcf" begin:vcard fn:Joachim Nilsson n:Nilsson;Joachim email;internet:joachim.nilsson@vmlinux.org x-mozilla-html:TRUE url:http://vmlinux.org/joachim/ version:2.1 end:vcard --------------020206040608090603060506--