From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#36348: 26.2; Indentation problem with Delphi inline variables Date: Mon, 22 Jul 2019 13:12:04 -0400 Message-ID: References: <83k1db8mbj.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="154474"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 36348-done@debbugs.gnu.org To: Pascal Quesseveur Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 22 19:13:11 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hpbs6-000e3v-Tf for geb-bug-gnu-emacs@m.gmane.org; Mon, 22 Jul 2019 19:13:11 +0200 Original-Received: from localhost ([::1]:36144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpbs5-0007DA-Lx for geb-bug-gnu-emacs@m.gmane.org; Mon, 22 Jul 2019 13:13:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47687) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpbs1-0007Av-Gf for bug-gnu-emacs@gnu.org; Mon, 22 Jul 2019 13:13:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpbs0-0003mo-GH for bug-gnu-emacs@gnu.org; Mon, 22 Jul 2019 13:13:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpbrz-0003lz-Mc for bug-gnu-emacs@gnu.org; Mon, 22 Jul 2019 13:13:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hpbrz-00048E-HK for bug-gnu-emacs@gnu.org; Mon, 22 Jul 2019 13:13:03 -0400 Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 Jul 2019 17:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 36348 X-GNU-PR-Package: emacs Mail-Followup-To: 36348@debbugs.gnu.org, monnier@iro.umontreal.ca, pquessev@gmail.com Original-Received: via spool by 36348-done@debbugs.gnu.org id=D36348.156381553515786 (code D ref 36348); Mon, 22 Jul 2019 17:13:03 +0000 Original-Received: (at 36348-done) by debbugs.gnu.org; 22 Jul 2019 17:12:15 +0000 Original-Received: from localhost ([127.0.0.1]:33551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpbrD-00046Y-7O for submit@debbugs.gnu.org; Mon, 22 Jul 2019 13:12:15 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:3280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpbrB-000465-5T for 36348-done@debbugs.gnu.org; Mon, 22 Jul 2019 13:12:13 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 7F2998119A; Mon, 22 Jul 2019 13:12:06 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 2A55A80D66; Mon, 22 Jul 2019 13:12:05 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1563815525; bh=hWDYGBva9u4Pc3/pslWJDEHphSkg/dp23Ldn67Fczyg=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=PUe9oZQ1q8jWpaFm3xCdibNYfvzJrny1lH51G1VXsOK3OD8fJeG29HKqt/HhY00tZ Kt1hEBcFEHGXpDtvMZ+OmAQT7N1syS5RfIOE25OE3e3/gKcPBNGoFmv6PnzErhechF 75BlFMIKy3GKtv30U3fKbCaKLNINaj3aGyLve5PR4F85KksHgBC2UWnAghO2JaGPj7 Zk2pD2kdttepbwjlRsIG9MBH2JzZNlaMxiMTN8PcKLodDAAU94uCiGzJi0ff9ex4SU /3bKnjSKsKpNWtYdVJI/8VVlztYh4z8KBdF5lYjWaM2DzDYVXdg+d2k5OHC/pEhMEt osuqQrXpyBOyA== Original-Received: from alfajor (modemcable157.163-203-24.mc.videotron.ca [24.203.163.157]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 027F4121487; Mon, 22 Jul 2019 13:12:04 -0400 (EDT) In-Reply-To: <83k1db8mbj.fsf@gmail.com> (Pascal Quesseveur's message of "Mon, 24 Jun 2019 09:38:40 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:163599 Archived-At: > Indentation doesn't work properly when using inline variable > introduced by Delphi 10.3 (using Emacs 26.2, opascal, > opascal-indent-level is 3): > > for i := 0 to str.Length - 1 do > Write (str.Chars[i]); > > for var i := 0 to str.Length - 1 do > Write (str.Chars[i]); I just pushed the patch below which seems to fix it. Stefan diff --git a/lisp/progmodes/opascal.el b/lisp/progmodes/opascal.el index 7d51816bf4..9bb62ced3b 100644 --- a/lisp/progmodes/opascal.el +++ b/lisp/progmodes/opascal.el @@ -1177,8 +1177,11 @@ opascal-enclosing-indent-of (throw 'done (opascal-stmt-line-indent-of (or last-token token) opascal-indent-level))) - ;; We indent relative to an enclosing declaration section. - ((opascal-is token-kind opascal-decl-sections) + ;; We indent relative to an enclosing declaration section, + ;; unless this is within the a delimited expression + ;; (bug#36348). + ((and (not expr-delimited) + (opascal-is token-kind opascal-decl-sections)) (throw 'done (opascal-indent-of (if last-token last-token token) opascal-indent-level)))