aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackson Ray Hamilton2015-11-02 21:14:05 -0800
committerJackson Ray Hamilton2015-11-02 21:14:05 -0800
commit7ad183d8905e7b15690b98d67ae0ae22d873bfa8 (patch)
treea223f37b3c32cadc4f129cee143448105143ce17
parent1cd0e89ab93b4e27d2b55332649558f044b6c6b5 (diff)
downloademacs-7ad183d8905e7b15690b98d67ae0ae22d873bfa8.tar.gz
emacs-7ad183d8905e7b15690b98d67ae0ae22d873bfa8.zip
Fix ChangeLog.2 entry for js-jsx-mode
-rw-r--r--ChangeLog.28
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index ddb26352220..599a4c85b9c 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -31,8 +31,16 @@
31 Add JSX indentation via js-jsx-mode (Bug#21799) 31 Add JSX indentation via js-jsx-mode (Bug#21799)
32 32
33 * progmodes/js.el: Add JSX indentation support. 33 * progmodes/js.el: Add JSX indentation support.
34 (js--jsx-end-tag-re)
35 (js--jsx-after-tag-re): New variables.
36 (js--jsx-find-before-tag)
37 (js--jsx-indented-element-p)
38 (js--as-sgml)
39 (js--expression-in-sgml-indent-line)
34 (js-jsx-indent-line) 40 (js-jsx-indent-line)
35 (js-jsx-mode): New functions. 41 (js-jsx-mode): New functions.
42 * test/indent/js-jsx.el: New file.
43 * etc/NEWS: Add information about js-jsx-mode.
36 44
372015-10-31 Michael Albinus <michael.albinus@gmx.de> 452015-10-31 Michael Albinus <michael.albinus@gmx.de>
38 46