[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/mhtml-mode 3adbe84 08/11: make js.el respect prog-
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] feature/mhtml-mode 3adbe84 08/11: make js.el respect prog-first-column |
Date: |
Thu, 23 Mar 2017 23:15:04 -0400 (EDT) |
branch: feature/mhtml-mode
commit 3adbe849b61c3b6dc265aae3bbbdec9d9312fcf8
Author: Tom Tromey <address@hidden>
Commit: Tom Tromey <address@hidden>
make js.el respect prog-first-column
* lisp/progmodes/js.el (js--proper-indentation): Call prog-first-column.
---
lisp/progmodes/js.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index aed42a8..84c9111 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)
@@ -2124,7 +2125,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
- [Emacs-diffs] branch feature/mhtml-mode created (now 3499915), Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 9604256 01/11: change auto-insert to use derived-mode-p, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode bf7dd0c 03/11: change semantic to use derived-mode-p, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode c366e52 07/11: make smie.el respect prog-first-column, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 3adbe84 08/11: make js.el respect prog-first-column,
Tom Tromey <=
- [Emacs-diffs] feature/mhtml-mode 6c3ceb6 02/11: change calc to use derived-mode-p, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 2d377d2 04/11: change org to use derived-mode-p, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode fe83525 05/11: change align to use derived-mode-p, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 3499915 11/11: enable mhtml-mode by default, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 48f5cbb 09/11: change sgml-mode to help multi-html mode, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 60be4b7 06/11: change viper to use derived-mode-p, Tom Tromey, 2017/03/23
- [Emacs-diffs] feature/mhtml-mode 23e71eb 10/11: add mhtml-mode.el, Tom Tromey, 2017/03/23