branch: elpa/annotate
commit 3e5d14fde8f4d28914b19d0e8e663e4cc371f97e
Author: cage <cage-invalid@invalid>
Commit: cage <cage-invalid@invalid>
- updated documentation.
---
Changelog | 40 ++++++++++++++++++++++++++++++++++++++++
NEWS.org | 7 ++++++-
README.org | 2 +-
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 7e72ce317e..3dd166413c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,43 @@
+2020-12-23 cage
+
+ * annotate.el:
+
+ - changed customizable variable related to exporting. As we are
+ using diff-mode could instruct the executable to operate
+ accordingly to a command line.
+
+2020-12-23 cage
+
+ * annotate.el:
+
+ - rewritten export and integrate of annotations export use now the
+ Emacs diff functions to generate a buffer containing the patch.
+
+2020-12-23 cage
+
+ * annotate.el:
+
+ - fixed export for annotated text made from a single line.
+
+2020-12-22 cage
+
+ * annotate.el:
+
+ - removed code, in integration procedures, that should never runs.
+
+2020-12-22 cage
+
+ * annotate.el:
+
+ - fixed integration of multiline annotated text.
+
+2020-12-20 cage
+
+ * Changelog, NEWS.org, annotate.el:
+
+ - updated version;
+ - updated NEWS and Changelog (also fixed grammar for the former).
+
2020-12-19 cage
* annotate.el:
diff --git a/NEWS.org b/NEWS.org
index c87be453e2..f4b1379cfe 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -160,7 +160,7 @@
Also a problem with adjacent annotation's coloring has been fixed.
-- 2020-12-20 V1.1.0 Bastian Bechtold, cage ::
+- 2020-12-24 V1.1.0 Bastian Bechtold, cage ::
This version improves the visual style of annotated text that if
formed by more than one line.
@@ -172,3 +172,8 @@
This improvements has been suggested by the user Ran that also
helped testing this new version of the package. Thank you!
+
+ Finally import and export of annotation has been fixed.
+
+ Related to the last fix the variable ~annotate-diff-export-context~
+ has been removed.
diff --git a/README.org b/README.org
index 44df957a2f..e32f61ee6f 100644
--- a/README.org
+++ b/README.org
@@ -120,7 +120,7 @@ as comments into the current buffer, like this:
**** related customizable variable
- ~annotate-integrate-marker~
- - ~annotate-diff-export-context~
+ - ~annotate-diff-export-options~
- ~annotate-integrate-highlight~
- ~annotate-fallback-comment~
