From: Tom Tromey <tom@tromey.com>
Date: Thu, 23 Mar 2017 17:33:22 +0000 (-0600)
Subject: make js.el respect prog-first-column
X-Git-Tag: emacs-26.0.90~521^2~715
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5331ef8a1861c95fd634bf90c8c3ea624286820d;p=emacs.git

make js.el respect prog-first-column

* lisp/progmodes/js.el (js--proper-indentation): Call prog-first-column.
---

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 3c720c05610..c220353e9b7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -53,6 +53,7 @@
 (require 'moz nil t)
 (require 'json nil t)
 (require 'sgml-mode)
+(require 'prog-mode)
 
 (eval-when-compile
   (require 'cl-lib)
@@ -2125,7 +2126,7 @@ indentation is aligned to that column."
 
           ((js--continued-expression-p)
            (+ js-indent-level js-expr-indent-offset))
-          (t 0))))
+          (t (prog-first-column)))))
 
 ;;; JSX Indentation