From 58335d492ae01caf225a029e5b2be272fa12f987 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 9 Sep 2015 21:36:29 +0300
Subject: [PATCH] Add NEWS and bump the version

---
 NEWS.md     | 18 ++++++++++++++++++
 js2-mode.el |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 300bc843c..798c51aa4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,23 @@
 # History of user-visible changes
 
+## 20150909
+
+* `js2-mode` now derives from `js-mode`. That means the former
+  function will run `js-mode-hook`, as well as `js2-mode-hook`. The
+  key bindings will default to `js-mode-map` where they're not set in
+  `js2-mode-map`. And in Emacs 25 or later (including the snapshot
+  builds), `js2-mode` uses the indentation code from `js-mode`.  Where
+  feasible, the user options (and functions) now have aliases, but if
+  you're using Emacs 25 and you see an indentation-related setting
+  that stopped working, try setting the one for the `js` group: `M-x
+  customize-group RET js RET`.
+
+* New command: `js2-jump-to-definition`. It's bound to `M-.` by
+  default, via remapping `js-find-symbol`. To get back to the default
+  `M-.` binding (e.g. `find-tag`), put this in your init file:
+
+      (eval-after-load 'js (define-key js-mode-map (kbd "M-.") nil))
+
 ## 20150713
 
 * More comprehensive strict mode warnings and syntax errors.
diff --git a/js2-mode.el b/js2-mode.el
index 975f71f68..926003d5a 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -7,7 +7,7 @@
 ;;         Dmitry Gutov <dgutov@yandex.ru>
 ;; URL:  https://github.com/mooz/js2-mode/
 ;;       http://code.google.com/p/js2-mode/
-;; Version: 20150713
+;; Version: 20150909
 ;; Keywords: languages, javascript
 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
 
-- 
2.39.2