From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#15613: Wrong indentation in Shell-script[sh] mode? Date: Wed, 16 Oct 2013 18:41:27 -0400 Message-ID: References: <525C59B0.7090804@alice.it> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1381963327 18390 80.91.229.3 (16 Oct 2013 22:42:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Oct 2013 22:42:07 +0000 (UTC) Cc: 15613@debbugs.gnu.org, Angelo Graziosi To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Oct 17 00:42:08 2013 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 1VWZn5-0004UX-NU for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Oct 2013 00:42:07 +0200 Original-Received: from localhost ([::1]:49602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWZn5-0004DM-CF for geb-bug-gnu-emacs@m.gmane.org; Wed, 16 Oct 2013 18:42:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWZn1-0004DA-Ua for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2013 18:42:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VWZn1-0004wk-6a for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2013 18:42:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:40693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWZn1-0004wg-30 for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2013 18:42:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VWZn0-0008Nv-ED for bug-gnu-emacs@gnu.org; Wed, 16 Oct 2013 18:42:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 16 Oct 2013 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15613 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15613-submit@debbugs.gnu.org id=B15613.138196329332197 (code B ref 15613); Wed, 16 Oct 2013 22:42:02 +0000 Original-Received: (at 15613) by debbugs.gnu.org; 16 Oct 2013 22:41:33 +0000 Original-Received: from localhost ([127.0.0.1]:54712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VWZmW-0008NE-Fu for submit@debbugs.gnu.org; Wed, 16 Oct 2013 18:41:32 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:37308 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VWZmU-0008N4-20 for 15613@debbugs.gnu.org; Wed, 16 Oct 2013 18:41:30 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1VWZmR-0007XJ-SW; Wed, 16 Oct 2013 18:41:28 -0400 X-Spook: Defcon csystems Verisign North Korea illuminati World X-Ran: BRRO;#`^_@_/a0Xo=l*xPM#RFSzz&7>YIJcw@ES&i}=B%!_}![lwzP5G0d@m`gIH//X*D" X-Hue: black X-Attribution: GM In-Reply-To: (Stefan Monnier's message of "Tue, 15 Oct 2013 10:37:44 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:79324 Archived-At: By experiment, reverting the "Always setup SMIE..." part of your 2013-10-11 change fixes this regression. *** lisp/progmodes/sh-script.el 2013-10-13 23:21:56 +0000 --- lisp/progmodes/sh-script.el 2013-10-16 22:35:56 +0000 *************** *** 2248,2253 **** --- 2248,2254 ---- (sh-feature sh-indent-supported)) (progn (message "Setting up indent for shell type %s" sh-shell) + (if sh-use-smie (let ((mksym (lambda (name) (intern (format "sh-smie-%s-%s" sh-indent-supported-here name))))) *************** *** 2255,2261 **** (funcall mksym "rules") :forward-token (funcall mksym "forward-token") :backward-token (funcall mksym "backward-token"))) - (unless sh-use-smie (setq-local parse-sexp-lookup-properties t) (setq-local sh-kw-alist (sh-feature sh-kw)) (let ((regexp (sh-feature sh-kws-for-done))) --- 2256,2261 ----