diff options
| author | Tom Tromey | 2017-03-23 11:33:22 -0600 |
|---|---|---|
| committer | Tom Tromey | 2017-04-05 15:53:39 -0600 |
| commit | 5331ef8a1861c95fd634bf90c8c3ea624286820d (patch) | |
| tree | 6243181fc45ce464633e17120f1aac976e9e1086 | |
| parent | 473a42010c5b37e30d9bfb81cae77de6a95073eb (diff) | |
| download | emacs-5331ef8a1861c95fd634bf90c8c3ea624286820d.tar.gz emacs-5331ef8a1861c95fd634bf90c8c3ea624286820d.zip | |
make js.el respect prog-first-column
* lisp/progmodes/js.el (js--proper-indentation): Call prog-first-column.
| -rw-r--r-- | lisp/progmodes/js.el | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ | |||
| 53 | (require 'moz nil t) | 53 | (require 'moz nil t) |
| 54 | (require 'json nil t) | 54 | (require 'json nil t) |
| 55 | (require 'sgml-mode) | 55 | (require 'sgml-mode) |
| 56 | (require 'prog-mode) | ||
| 56 | 57 | ||
| 57 | (eval-when-compile | 58 | (eval-when-compile |
| 58 | (require 'cl-lib) | 59 | (require 'cl-lib) |
| @@ -2125,7 +2126,7 @@ indentation is aligned to that column." | |||
| 2125 | 2126 | ||
| 2126 | ((js--continued-expression-p) | 2127 | ((js--continued-expression-p) |
| 2127 | (+ js-indent-level js-expr-indent-offset)) | 2128 | (+ js-indent-level js-expr-indent-offset)) |
| 2128 | (t 0)))) | 2129 | (t (prog-first-column))))) |
| 2129 | 2130 | ||
| 2130 | ;;; JSX Indentation | 2131 | ;;; JSX Indentation |
| 2131 | 2132 | ||