From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#17842: sh-script's indentation gets confused by \; Date: Tue, 24 Jun 2014 09:49:28 -0400 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1403617827 16818 80.91.229.3 (24 Jun 2014 13:50:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Jun 2014 13:50:27 +0000 (UTC) To: 17842@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 24 15:50:20 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WzR76-0003Fq-72 for geb-bug-gnu-emacs@m.gmane.org; Tue, 24 Jun 2014 15:50:20 +0200 Original-Received: from localhost ([::1]:59906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzR75-0003sD-EO for geb-bug-gnu-emacs@m.gmane.org; Tue, 24 Jun 2014 09:50:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzR6v-0003ox-OJ for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:50:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzR6p-00037m-JE for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:50:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzR6p-00036u-G9 for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:50:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WzR6o-0000hn-PH for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:50:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Jun 2014 13:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 17842 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14036177962692 (code B ref -1); Tue, 24 Jun 2014 13:50:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Jun 2014 13:49:56 +0000 Original-Received: from localhost ([127.0.0.1]:59098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WzR6h-0000hL-UN for submit@debbugs.gnu.org; Tue, 24 Jun 2014 09:49:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41662) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WzR6f-0000h5-AP for submit@debbugs.gnu.org; Tue, 24 Jun 2014 09:49:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzR6T-0002vW-Lm for submit@debbugs.gnu.org; Tue, 24 Jun 2014 09:49:47 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:56838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzR6T-0002vN-IU for submit@debbugs.gnu.org; Tue, 24 Jun 2014 09:49:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzR6N-0003ii-Rb for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:49:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzR6I-0002rD-3g for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:49:35 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:38171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzR6H-0002qv-V9 for bug-gnu-emacs@gnu.org; Tue, 24 Jun 2014 09:49:30 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArQGAIDvNVNLd+D9/2dsb2JhbABZgwY7gw/BVBd0giUBAQRXKEomGA03h3EIn3+yGheOKQEBbIQiBKkZgWqDTCGBNQ X-IPAS-Result: ArQGAIDvNVNLd+D9/2dsb2JhbABZgwY7gw/BVBd0giUBAQRXKEomGA03h3EIn3+yGheOKQEBbIQiBKkZgWqDTCGBNQ X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="69381054" Original-Received: from 75-119-224-253.dsl.teksavvy.com (HELO pastel.home) ([75.119.224.253]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 24 Jun 2014 09:49:28 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 3DBBB6036C; Tue, 24 Jun 2014 09:49:28 -0400 (EDT) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:90731 Archived-At: --=-=-= Content-Type: text/plain Splitting into another bug. --=-=-= Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: monnier@iro.umontreal.ca Delivered-To: monnier@iro.umontreal.ca Received: from perlin.iro.umontreal.ca (perlin.iro.umontreal.ca [132.204.24.51]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id 240C524216 for ; Mon, 23 Jun 2014 12:10:32 -0400 (EDT) X-Greylist: delayed 318 seconds by postgrey-1.27 at perlin.iro.umontreal.ca; Mon, 23 Jun 2014 12:10:17 EDT Received: from mail.uni-ulm.de (mail.uni-ulm.de [134.60.1.11]) by perlin.iro.umontreal.ca (Postfix) with ESMTP id ACF48830001 for ; Mon, 23 Jun 2014 12:10:17 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0) by mail.uni-ulm.de (8.14.9/8.14.7) with ESMTP id s5NG4oVL025382; Mon, 23 Jun 2014 18:04:50 +0200 (CEST) Received: from 10.196.208.71 (10.196.208.71 [10.196.208.71]) by imap.uni-ulm.de (Horde MIME library) with HTTP; Mon, 23 Jun 2014 18:04:50 +0200 Message-ID: <20140623180450.pgyd1ksywokgcs8s@imap.uni-ulm.de> Date: Mon, 23 Jun 2014 18:04:50 +0200 From: Reiner Steib To: Stefan Monnier Cc: 17818@debbugs.gnu.org Subject: Re: bug#17818: 24.3.91; sh-learn-buffer-indent doesn't learn current indent anymore References: <87ha3fy6lv.fsf@marauder.physik.uni-ulm.de> In-Reply-To: User-Agent: Internet Messaging Program (IMP) H3 (4.1.5) X-DCC-sonic.net-Metrics: poseidon; whitelist X-Virus-Scanned: by amavisd-new X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.599, requis 5, autolearn=not spam, BAYES_00 -2.60, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: reiner.steib@gmx.de X-Spam-Status: No MIME-Version: 1.0 Content-Type: text/plain On Fri, 20 Jun 2014, Stefan Monnier wrote: >> if true; do >> echo "My sh-basic-offset offset should be 2." >> fi > > The above "do" should be "then", right? Sure, sorry. (I corrected it in my test-script, but not in the mail). > I installed the patch below which fixes some of the problem (the first > hunk fixes an incorrect guess and the second fixes the code so the guess > is actually activated). > > Please confirm that the result is OK for your use case. Works much better, thanks. However, I tested[1] the new code with the following script and found some incorrect indents (see diff below, hope the whitespace doesn't get changed). Bye, Reiner. [1] M-x sh-learn-buffer-indent RET, M-x mark-whole-buffer RET, M-x indent-region RET, M-x diff-buffer-with-file RET #!/bin/bash if true; then echo "My sh-basic-offset offset should be 2." fi for a in 1 2; do echo "My sh-basic-offset offset should be 2." done filter_1 () { tr -d '"' | awk -F\; '{ if ($7 == 0 || $7 == 1) { print $7 } ; \ print $5 "," $1 }' | grep -v "^," } filter_3 () { tr -d '"`' | tr ' ' ' ' | \ awk -F\; -f filter.awk | \ grep -v "^," | sort -t, -k2,2 } tail -q -n+2 assets-ws.csv | awk -F \; -f merge.awk \ <( cat file1.csv file2.csv ) - | \ filter_2 | $conv | \ sed -f a.sed | sort -t\; -k3,3 -k1,1 > w.csv # end --- shell-script-test.sh +++ # @@ -12,21 +12,21 @@ filter_1 () { tr -d '"' | - awk -F\; '{ if ($7 == 0 || $7 == 1) { print $7 } ; \ +awk -F\; '{ if ($7 == 0 || $7 == 1) { print $7 } ; \ print $5 "," $1 }' | - grep -v "^," +grep -v "^," } filter_3 () { tr -d '"`' | tr ' ' ' ' | \ - awk -F\; -f filter.awk | \ - grep -v "^," | sort -t, -k2,2 + awk -F\; -f filter.awk | \ +grep -v "^," | sort -t, -k2,2 } tail -q -n+2 assets-ws.csv | awk -F \; -f merge.awk \ - <( cat file1.csv file2.csv ) - | \ - filter_2 | $conv | \ - sed -f a.sed | sort -t\; -k3,3 -k1,1 > w.csv + <( cat file1.csv file2.csv ) - | \ + filter_2 | $conv | \ + sed -f a.sed | sort -t\; -k3,3 -k1,1 > w.csv # end Diff finished. Mon Jun 23 17:56:00 2014 --=-=-=--