From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.bugs Subject: bug#17818: 24.3.91; sh-learn-buffer-indent doesn't learn current indent anymore Date: Mon, 23 Jun 2014 18:04:50 +0200 Message-ID: <20140623180450.pgyd1ksywokgcs8s@imap.uni-ulm.de> References: <87ha3fy6lv.fsf@marauder.physik.uni-ulm.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1403539690 2738 80.91.229.3 (23 Jun 2014 16:08:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Jun 2014 16:08:10 +0000 (UTC) Cc: 17818@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jun 23 18:08:02 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 1Wz6mU-0003CW-03 for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 Jun 2014 18:07:42 +0200 Original-Received: from localhost ([::1]:54492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6mT-00072h-FM for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 Jun 2014 12:07:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6kz-00052s-Bu for bug-gnu-emacs@gnu.org; Mon, 23 Jun 2014 12:06:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz6ks-0006ad-R4 for bug-gnu-emacs@gnu.org; Mon, 23 Jun 2014 12:06:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz6ks-0006aR-Oi for bug-gnu-emacs@gnu.org; Mon, 23 Jun 2014 12:06:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Wz6ks-00026z-03 for bug-gnu-emacs@gnu.org; Mon, 23 Jun 2014 12:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Reiner Steib Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 23 Jun 2014 16:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17818 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17818-submit@debbugs.gnu.org id=B17818.14035395058012 (code B ref 17818); Mon, 23 Jun 2014 16:06:01 +0000 Original-Received: (at 17818) by debbugs.gnu.org; 23 Jun 2014 16:05:05 +0000 Original-Received: from localhost ([127.0.0.1]:58404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wz6jr-00024k-Hl for submit@debbugs.gnu.org; Mon, 23 Jun 2014 12:05:05 -0400 Original-Received: from mail.uni-ulm.de ([134.60.1.11]:44753) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wz6jk-00024S-A8 for 17818@debbugs.gnu.org; Mon, 23 Jun 2014 12:04:58 -0400 Original-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) Original-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 In-Reply-To: Content-Disposition: inline User-Agent: Internet Messaging Program (IMP) H3 (4.1.5) X-DCC-sonic.net-Metrics: poseidon; whitelist X-Virus-Scanned: by amavisd-new 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:90697 Archived-At: 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 =3D=3D 0 || $7 =3D=3D 1) { print $7 } ; \ print $5 "," $1 }' | grep -v "^," } filter_3 () { tr -d '"`' | tr '=09' ' ' | \ 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 =3D=3D 0 || $7 =3D=3D 1) { print $7 } ; \ +awk -F\; '{ if ($7 =3D=3D 0 || $7 =3D=3D 1) { print $7 } ; \ print $5 "," $1 }' | - grep -v "^," +grep -v "^," } filter_3 () { tr -d '"`' | tr '=09' ' ' | \ - 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 +=09=09=09=09=09 <( cat file1.csv file2.csv ) - | \ +=09=09=09=09=09 filter_2 | $conv | \ +=09=09=09=09=09 sed -f a.sed | sort -t\; -k3,3 -k1,1 > w.csv # end Diff finished. Mon Jun 23 17:56:00 2014