From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Simen =?UTF-8?Q?Heggest=C3=B8yl?= Newsgroups: gmane.emacs.bugs Subject: bug#19946: 24.4; js-mode, indentation Date: Sat, 19 Mar 2016 23:13:11 +0100 Message-ID: <87r3f6unew.fsf@gmail.com> References: <1424858977.3139392.232164745.05CFB51D@webmail.messagingengine.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458425663 32351 80.91.229.3 (19 Mar 2016 22:14:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 19 Mar 2016 22:14:23 +0000 (UTC) Cc: jostein@kjonigsen.net, 19946@debbugs.gnu.org, dan.colascione@gmail.com To: Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Mar 19 23:14:10 2016 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 1ahP8L-0002md-TX for geb-bug-gnu-emacs@m.gmane.org; Sat, 19 Mar 2016 23:14:10 +0100 Original-Received: from localhost ([::1]:50707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahP8L-0001e7-5L for geb-bug-gnu-emacs@m.gmane.org; Sat, 19 Mar 2016 18:14:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahP8H-0001dA-Jc for bug-gnu-emacs@gnu.org; Sat, 19 Mar 2016 18:14:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahP8E-0005X1-DG for bug-gnu-emacs@gnu.org; Sat, 19 Mar 2016 18:14:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahP8E-0005Wx-9p for bug-gnu-emacs@gnu.org; Sat, 19 Mar 2016 18:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ahP8E-0003o1-63 for bug-gnu-emacs@gnu.org; Sat, 19 Mar 2016 18:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Simen =?UTF-8?Q?Heggest=C3=B8yl?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 19 Mar 2016 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19946 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19946-submit@debbugs.gnu.org id=B19946.145842560014555 (code B ref 19946); Sat, 19 Mar 2016 22:14:02 +0000 Original-Received: (at 19946) by debbugs.gnu.org; 19 Mar 2016 22:13:20 +0000 Original-Received: from localhost ([127.0.0.1]:53994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ahP7Y-0003mh-Hm for submit@debbugs.gnu.org; Sat, 19 Mar 2016 18:13:20 -0400 Original-Received: from mail-lb0-f175.google.com ([209.85.217.175]:36239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ahP7X-0003mV-2M for 19946@debbugs.gnu.org; Sat, 19 Mar 2016 18:13:19 -0400 Original-Received: by mail-lb0-f175.google.com with SMTP id qe11so53212328lbc.3 for <19946@debbugs.gnu.org>; Sat, 19 Mar 2016 15:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ML32ciE6mTlGs4dfrBxpeMTw05Jjurb0ZgKbuP80SPY=; b=WjPVSql2xoJh9VDYoKpY1ZPrCZpLT9uoOaOi9hJhy0hXArnN8yAibE3Slp0hsf5L9A 9C1DA7F/Hf41Szw4X80LxAFCXWFTnFx5P9tnyRHgpZwlR2YEW68nYl1JPdpmEbIYpXZx GGydFG9O6xJk0xolZkchADYl3vwQKAlIvIVPZ0VETOD6UIFqtEdSbR5lE1/Ssa4mvk7m tA0ByIxa+o18cd1X7G+3r7xmsVwJuez+7r+4FmbwZRCdXOlHpxUMc4IKnJbkPM3l6fEd onOsYNxcTmFurGOKPH+F16Df+QKCrT4pi8463CXqxHgniU0U/BDhtVKRfMrq+7wai2xg kiXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ML32ciE6mTlGs4dfrBxpeMTw05Jjurb0ZgKbuP80SPY=; b=fQIcT6JhJ0E0UIaMLNSHrD0exdG89qnpaSwT2lClot0HyeT9sN81blkjBJfsjlPlG3 MKUh08z/GQsUnin9U7zSHtE5MvIWx4xesGfH0N+pucO2oFXzBu5GhDu6PH4JSJBkb7bJ WiujK1nP2AnMinsrN2+aX9AK4czuRNZtCSAPC9xSy60fXfZKub7H1H7mOhLOZvWUY9uf vK/UBR5tlMFaTFPP3ljbh+5GLh0QsMbQ0nhYMwGNGvhNli1Ed852Jz62JHm7QrjfroLp zqreaO2SBu05kJJznpm9CVGaDTSA+cAC0/Waysk3nKlFrbad+aGXfCWvCasPMzzOMJKR 0mZg== X-Gm-Message-State: AD7BkJK6pOBCNe6mYGumxLsicjj9QTp0kSCuMV+9eyAbyzpJKUl+tdKxngeHFER17zbLDA== X-Received: by 10.112.227.71 with SMTP id ry7mr8152837lbc.50.1458425593121; Sat, 19 Mar 2016 15:13:13 -0700 (PDT) Original-Received: from x240 (168.165.34.95.customer.cdi.no. [95.34.165.168]) by smtp.gmail.com with ESMTPSA id p141sm3282568lfe.40.2016.03.19.15.13.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Mar 2016 15:13:12 -0700 (PDT) In-Reply-To: <1424858977.3139392.232164745.05CFB51D@webmail.messagingengine.com> ("Jostein \=\?utf-8\?Q\?Kj\=C3\=B8nigsen\=22's\?\= message of "Wed, 25 Feb 2015 11:09:37 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) 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: 208.118.235.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:115104 Archived-At: Can confirm that this bug is still present on the current master branch (070b9de). The following patch seems to fix it: >From 9b9f09d518617d165833602d863ea8afedcec401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Sat, 19 Mar 2016 21:33:02 +0100 Subject: [PATCH] Handle indentation after carriage return better * lisp/progmodes/js.el (js--proper-indentation): Handle indentation after carriage return better (bug#19946). --- lisp/progmodes/js.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 1e5cc60..a156080 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1963,7 +1963,7 @@ js--proper-indentation (switch-keyword-p (looking-at "default\\_>\\|case\\_>[^:]")) (continued-expr-p (js--continued-expression-p))) (goto-char (nth 1 parse-status)) ; go to the opening char - (if (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)") + (if (looking-at "[({[]\\s-*\\(/[/*]\\|\n\\|\r\\)") (progn ; nothing following the opening paren/bracket (skip-syntax-backward " ") (when (eq (char-before) ?\)) (backward-list)) -- 2.7.0