From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Andrew W. Nosenko" Newsgroups: gmane.emacs.devel Subject: Re: For 23.1 release ... please. (Was: Re: lisp/progmodes/cc-styles.el indentation broken in ellemtel mode) Date: Fri, 1 Aug 2008 13:38:23 +0300 Message-ID: <6161f3180808010338u4ce6d481ub6cf9fe920ee73fd@mail.gmail.com> References: <20080715124409.GA6211@vmlinux.org> <6161f3180807160825t7014be0au266dfb38ca929313@mail.gmail.com> <20080717005341.GA26458@vmlinux.org> <488CB24F.7010707@vmlinux.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1217587176 9772 80.91.229.12 (1 Aug 2008 10:39:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Aug 2008 10:39:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Joachim Nilsson" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 01 12:40:26 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 1KOs3a-0007eu-DD for ged-emacs-devel@m.gmane.org; Fri, 01 Aug 2008 12:40:22 +0200 Original-Received: from localhost ([127.0.0.1]:45666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KOs2f-0001HN-RQ for ged-emacs-devel@m.gmane.org; Fri, 01 Aug 2008 06:39:25 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KOs1l-0000N0-LD for emacs-devel@gnu.org; Fri, 01 Aug 2008 06:38:29 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KOs1j-0000LL-T8 for emacs-devel@gnu.org; Fri, 01 Aug 2008 06:38:29 -0400 Original-Received: from [199.232.76.173] (port=38126 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KOs1j-0000LC-KV for emacs-devel@gnu.org; Fri, 01 Aug 2008 06:38:27 -0400 Original-Received: from rv-out-0708.google.com ([209.85.198.247]:23378) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KOs1i-000548-Ok for emacs-devel@gnu.org; Fri, 01 Aug 2008 06:38:27 -0400 Original-Received: by rv-out-0708.google.com with SMTP id k29so1016984rvb.6 for ; Fri, 01 Aug 2008 03:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=MmbWZ8mxKIwZ5Lq9ozwa67Qmz0m7B797p7eXZXTv2do=; b=H+A5kaSslgBC2f1Ym6JpprmmogSJeDCoyaI/4W7HbdSDXirLMJaBnWVWT0exBPpZcj f20L6fUS61+oug48czSKtLAj5qvT8k4RwlhJ0mD3WXy2rQZd7TvMTPRJUo7QiMUeFs6D oDY6FEXeQc92PdESZZQGK07nt2dqv5R5PmMmg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=So/tKtxhqk55CibiA686FLiGG1LBI2H0hhWL5EsDNWgaDKs4cJzCifEAWUBJyNxQDY zgkTmHxq7T0bAXs6Bb9RqgJ5MSEi9wA3hyqxh1PkDoW2Sc3PhdNiiMLBfqzrR2tFkilh CQNVE/Egut65R1lQS9VeK8Au2vo/0yAOSY0Yw= Original-Received: by 10.141.180.5 with SMTP id h5mr5838718rvp.240.1217587103828; Fri, 01 Aug 2008 03:38:23 -0700 (PDT) Original-Received: by 10.141.27.8 with HTTP; Fri, 1 Aug 2008 03:38:23 -0700 (PDT) In-Reply-To: <488CB24F.7010707@vmlinux.org> Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:101858 Archived-At: 2008/7/27 Joachim Nilsson : > 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 >> > > > --- 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) > > Your patch changes 'inclass' from (inclass . ++) to (inclass . +) Is it intentional? -- Andrew W. Nosenko