[nongnu] elpa/nix-mode 1359b4ac3b 161/500: Add CHANGELOG

[ELPA Syncer]

branch: elpa/nix-mode
commit 1359b4ac3b82367647b0b0e33f1743a36ef3cb91
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>

    Add CHANGELOG
---
 CHANGELOG.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md    |  6 +++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..62c94e87ae
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,54 @@
+# Changelog
+
+## master
+
+### New files
+
+* create CHANGELOG.md
+
+### Changes
+
+## 1.2.1
+
+### Changes
+
+* fix byte-compile error
+
+## 1.2.0
+
+### New files
+
+* nix-format.el: format Nix code using nixfmt
+* nix-mode-mmm.el: treate multiline strings as sh-script within nix-mode
+* nix-repl.el: run nix-repl within Emacs
+* nix-prettify-mode.el: shorten store paths to /nix/store/…-foo-0.1
+* nix-shell.el: run nix-shell within Emacs
+* nix-company.el: complete Nix expressions through company
+
+### Changes
+
+All of these reflect nix-mode.el and what's been changed from the original 
nix-mode.el.
+
+* add some simple tests for nix-mode
+* handle antiquotes within Nix expressions better
+* handle multiline string better
+* fixes some edge cases for ''${ (escaped antiquote)
+* indent Nix code based on Nix-specific rules (not just indent-relative)
+* enforce Nix spacing style rules in nix-mode (2 spaces, no tabs)
+
+### Bug fixes
+
+This version fixes the following bugs in the original Nix version:
+
+* fixes the issue where /* by a multiline string is interpreted as a comment
+  (NixOS/nix#662)
+* fixes antiquote highlighting within double quotes like x="${asdf}" 
(NixOS/nix#1055)
+* fixes an issue in org-mode fontification of nix files (NixOS/nix#1040)
+* Also, should these issues should be closable: NixOS/nix#1419, NixOS/nix#1086,
+  NixOS/nix#1054
+
+## 1.0
+
+Original nix-mode
+from [https://github.com/NixOS/nix/](https://github.com/NixOS/nix/). See that
+repository for older changelog.
diff --git a/README.md b/README.md
index a426307f3c..87ef72ac0e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 # nix-mode
 An emacs major mode for editing nix expressions.
 
-This repository is based off of the nix-mode.el file in the [Nix 
repository](https://github.com/nixos/nix) at 
[misc/emacs/nix-mode.el](https://github.com/NixOS/nix/blob/master/misc/emacs/nix-mode.el).
+This repository is based off of the nix-mode.el file in
+the [Nix repository](https://github.com/nixos/nix)
+at
+[misc/emacs/nix-mode.el](https://github.com/NixOS/nix/blob/master/misc/emacs/nix-mode.el).
+Please see [the CHANGELOG 
file](https://github.com/matthewbauer/nix-mode/blob/master/CHANGELOG.md) for a 
list of changes.
 
 
 ## Other Nix Modes