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#17297: shell script gets weirdly indented inside case statement Date: Sat, 19 Apr 2014 13:14:46 -0400 Message-ID: References: <87vbu68gnh.fsf@jidanni.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1398222109 29312 80.91.229.3 (23 Apr 2014 03:01:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 23 Apr 2014 03:01:49 +0000 (UTC) Cc: 17297@debbugs.gnu.org To: =?UTF-8?Q?=E7=A9=8D=E4=B8=B9=E5=B0=BC?= Dan Jacobson Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 23 05:01:42 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 1WcnRO-0006Ko-Ej for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Apr 2014 05:01:42 +0200 Original-Received: from localhost ([::1]:58371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcnRO-0002oU-1W for geb-bug-gnu-emacs@m.gmane.org; Tue, 22 Apr 2014 23:01:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcnQv-0001oL-GG for bug-gnu-emacs@gnu.org; Tue, 22 Apr 2014 23:01:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcnQn-0003hc-At for bug-gnu-emacs@gnu.org; Tue, 22 Apr 2014 23:01:13 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcnQn-0003hY-8q for bug-gnu-emacs@gnu.org; Tue, 22 Apr 2014 23:01:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WcnQm-0003v7-W8 for bug-gnu-emacs@gnu.org; Tue, 22 Apr 2014 23:01:05 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Apr 2014 03:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17297 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17297-submit@debbugs.gnu.org id=B17297.139822203214855 (code B ref 17297); Wed, 23 Apr 2014 03:01:04 +0000 Original-Received: (at 17297) by debbugs.gnu.org; 23 Apr 2014 03:00:32 +0000 Original-Received: from localhost ([127.0.0.1]:55531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcnQF-0003rU-UB for submit@debbugs.gnu.org; Tue, 22 Apr 2014 23:00:32 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:58716) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WcnQD-0003rD-Ou for 17297@debbugs.gnu.org; Tue, 22 Apr 2014 23:00:30 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id s3N30RFZ013577; Tue, 22 Apr 2014 23:00:27 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id EFE7E664A4; Sat, 19 Apr 2014 13:14:46 -0400 (EDT) In-Reply-To: <87vbu68gnh.fsf@jidanni.org> ("=?UTF-8?Q?=E7=A9=8D=E4=B8=B9=E5=B0=BC?= Dan Jacobson"'s message of "Sat, 19 Apr 2014 05:35:46 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4920=0 X-NAI-Spam-Version: 2.3.0.9378 : core <4920> : inlines <759> : streams <1165012> : uri <1738093> 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:88227 Archived-At: > Why the weird indenting for this shell script? It's just that the tokenizer was confused with "do=", taken "do" for the keyword used in "while foo; do bar; done" rather than a variable identifier. I installed the patch below which should fix it. Stefan === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2014-03-05 19:02:55 +0000 +++ lisp/progmodes/sh-script.el 2014-04-19 17:12:02 +0000 @@ -1832,9 +1832,10 @@ (defun sh-smie--sh-keyword-p (tok) "Non-nil if TOK (at which we're looking) really is a keyword." - (if (equal tok "in") - (sh-smie--sh-keyword-in-p) - (sh-smie--keyword-p))) + (cond + ((looking-at "[[:alnum:]_]+=") nil) + ((equal tok "in") (sh-smie--sh-keyword-in-p)) + (t (sh-smie--keyword-p)))) (defun sh-smie-sh-forward-token () (if (and (looking-at "[ \t]*\\(?:#\\|\\(\\s|\\)\\|$\\)")