[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 5331ef8 08/12: make js.el respect prog-first-column
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] master 5331ef8 08/12: make js.el respect prog-first-column |
Date: |
Wed, 5 Apr 2017 18:17:30 -0400 (EDT) |
branch: master
commit 5331ef8a1861c95fd634bf90c8c3ea624286820d
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 3c720c0..c220353 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
- [Emacs-diffs] master updated (0074ed5 -> 04a5ce0), Tom Tromey, 2017/04/05
- [Emacs-diffs] master a2a3879 01/12: change auto-insert to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master c92bae9 04/12: change org to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master d056b1f 03/12: change semantic to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 089b159 02/12: change calc to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 5331ef8 08/12: make js.el respect prog-first-column,
Tom Tromey <=
- [Emacs-diffs] master 14659f6 06/12: change viper to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 95aba61 05/12: change align to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 473a420 07/12: make smie.el respect prog-first-column, Tom Tromey, 2017/04/05
- [Emacs-diffs] master d392b6e 09/12: change sgml-mode to help multi-html mode, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 04a5ce0 12/12: add two more mhtml tests, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 335174e 10/12: add mhtml-mode.el, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 59409f4 11/12: enable mhtml-mode by default, Tom Tromey, 2017/04/05