[nongnu] elpa/annotate 46aa377cfc 370/372: - upgraded version number;

[ELPA Syncer]

branch: elpa/annotate
commit 46aa377cfc31fbaa4a0e9e3ada54d5e299018b95
Author: cage <cage@invalid>
Commit: cage <cage@invalid>

    - upgraded version number;
    
    - updated NEWS.org and README.org.
---
 NEWS.org    |  4 ++++
 README.org  | 29 ++++++++++++++++++++++++++++-
 annotate.el |  4 ++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 243876fab9..40d8796add 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -275,3 +275,7 @@
   would  not happens  on  the  database (the  database  entry for  the
   annotation to  be deleted would not  be removed from the  file) and,
   when visiting the file, the annotation would be shown again.
+
+- 2022-01-26 v1.5.0 ::
+
+  This version add a new command to import a database file.
diff --git a/README.org b/README.org
index 1703fac7c1..ac98b7fbe6 100644
--- a/README.org
+++ b/README.org
@@ -87,7 +87,7 @@ can take advantage of its packages generated files management.
 
     If the line contains a single annotation that cover all the line
     annotating the newline Will ask to edit the annotation. If
-    `annotate-endline-annotate-whole-line' is nil annotating a newline
+    ~annotate-endline-annotate-whole-line~ is nil annotating a newline
     will signal an error.
 
 **** related customizable variable
@@ -154,6 +154,33 @@ as comments into the current buffer, like this:
      - ~annotate-integrate-highlight~
      - ~annotate-fallback-comment~
 
+
+* Importing
+
+An  annotation  database  file  can  be  imported  using  the  command
+~annotate-import-annotations~.
+
+When importing, overlapping annotations will be merged in a single
+annotation with the new annotated text that maximizes the portion of
+text annotated, e.g.
+
+#+BEGIN_SRC
+The quick brown fox ← text
+ ^^^^^^^^           ← first annotation
+      ********      ← second annotation
+ +++++++++++++      ← merged annotation
+#+END_SRC
+
+The text of the merged annotation is the concatenated text of the two
+annotations.
+
+Note that importing a database will modify permanently the file bound
+to the variable ~annotate-file~. If unsure of the results, backup
+that file before importing.
+
+**** related customizable variable
+     - ~annotate-database-confirm-import~.
+
 * Alternative visualization of annotations
 
 For typographically difficult scenarios (or just because you prefer
diff --git a/annotate.el b/annotate.el
index 5d6c126bcc..90e0a7b638 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Bastian Bechtold
 ;; URL: https://github.com/bastibe/annotate.el
 ;; Created: 2015-06-10
-;; Version: 1.4.3
+;; Version: 1.5.0
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "1.4.3"
+  :version "1.5.0"
   :group 'text)
 
 ;;;###autoload