From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: crash@vmlinux.org (Joachim Nilsson) Newsgroups: gmane.emacs.devel Subject: Re: lisp/progmodes/cc-styles.el indentation broken in ellemtel mode Date: Thu, 17 Jul 2008 02:53:41 +0200 Message-ID: <20080717005341.GA26458@vmlinux.org> References: <20080715124409.GA6211@vmlinux.org> <6161f3180807160825t7014be0au266dfb38ca929313@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="cNdxnHkX5QqsyA0e" X-Trace: ger.gmane.org 1216256066 25035 80.91.229.12 (17 Jul 2008 00:54:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Jul 2008 00:54:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Andrew W. Nosenko" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 17 02:55:14 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 1KJHm4-0004dN-W8 for ged-emacs-devel@m.gmane.org; Thu, 17 Jul 2008 02:55:13 +0200 Original-Received: from localhost ([127.0.0.1]:40043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJHlC-0007Uk-Ag for ged-emacs-devel@m.gmane.org; Wed, 16 Jul 2008 20:54:18 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KJHl7-0007Ub-VE for emacs-devel@gnu.org; Wed, 16 Jul 2008 20:54:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KJHl4-0007Su-Jk for emacs-devel@gnu.org; Wed, 16 Jul 2008 20:54:13 -0400 Original-Received: from [199.232.76.173] (port=38540 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJHl4-0007Sm-DA for emacs-devel@gnu.org; Wed, 16 Jul 2008 20:54:10 -0400 Original-Received: from vmlinux.org ([193.41.214.66]:56975) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KJHl3-0001sY-MY for emacs-devel@gnu.org; Wed, 16 Jul 2008 20:54:10 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by vmlinux.org (Postfix) with ESMTP id B76C76045; Thu, 17 Jul 2008 02:54:07 +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 26426-03; Thu, 17 Jul 2008 02:53:42 +0200 (CEST) Original-Received: by vmlinux.org (Postfix, from userid 1000) id 110F91904F; Thu, 17 Jul 2008 02:53:42 +0200 (CEST) Content-Disposition: inline In-Reply-To: <6161f3180807160825t7014be0au266dfb38ca929313@mail.gmail.com> User-Agent: Mutt/1.5.9i 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:100855 Archived-At: --cNdxnHkX5QqsyA0e Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --cNdxnHkX5QqsyA0e Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cc-styles.diff" Index: lisp/progmodes/cc-styles.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-styles.el,v retrieving revision 1.51 diff -u -r1.51 cc-styles.el --- 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) --cNdxnHkX5QqsyA0e--