From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 12 May 2021 13:41:26 +0000 (+0200)
Subject: Tweak indentation of #foo in js-mode
X-Git-Tag: emacs-28.0.90~2502
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b0dc15a0ac0715166fbce4b23cd0a3644a90714;p=emacs.git

Tweak indentation of #foo in js-mode

* lisp/progmodes/js.el (js--proper-indentation): Indent #define
(etc) to column 0, but otherwise indent #foo normally (bug#47488).
---

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index fac0d39b69f..1ab0459d704 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -2861,6 +2861,11 @@ return nil."
           ((nth 3 parse-status) 0) ; inside string
           ((when (and js-jsx-syntax (not js-jsx--indent-col))
              (save-excursion (js-jsx--indentation parse-status))))
+          ((and (eq (char-after) ?#)
+                (save-excursion
+                  (forward-char 1)
+                  (looking-at-p cpp-font-lock-keywords-source-directives)))
+           0)
           ((save-excursion (js--beginning-of-macro)) 4)
           ;; Indent array comprehension continuation lines specially.
           ((let ((bracket (nth 1 parse-status))