[nongnu] elpa/annotate a3d42262f5 5/5: Merge pull request #128 from cage2/updated-version-after-mail-line-changes

[ELPA Syncer]

branch: elpa/annotate
commit a3d42262f518a52e221c038cca3c1630ea90db25
Merge: fc3d60c439 e45b9b35a8
Author: cage2 <1257703+cage2@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #128 from cage2/updated-version-after-mail-line-changes
    
    Increased version number.
---
 Changelog   | 20 ++++++++++++++++++++
 NEWS.org    |  7 ++++++-
 annotate.el | 15 +++++++--------
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index 09d767f4f7..dd6d9add41 100644
--- a/Changelog
+++ b/Changelog
@@ -1,10 +1,30 @@
+2022-04-08 btd, cage
+
+        * .gitignore,
+        * NEWS.org,
+        * annotate.el:
+
+        - fixes maintainers list as proposed by Stefan Monnier
+          also adds other proposed changes, such as ignoring ELPA-generated
+          files
+        - Merge pull request #127 from bastibe/bastibe/fix-maintainers
+        - increased version number;
+        - reverted a form;
+        - updated ad fixed NEWS.org.
+
+2022-04-07 cage
+
+        Merge pull request #125 from cage2/fixed-deleting-annotation
+
 2022-03-09 cage
 
+        * Changelog,
         * NEWS.org,
         * annotate.el:
 
         - increased version number.
         - updated NEWS.org.
+        - updated Changelog.
 
 2022-03-03 cage
 
diff --git a/NEWS.org b/NEWS.org
index cf5179ee99..b74ffd8ae0 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,4 +1,9 @@
-- 2022-01-26 v1.5.1 cage ::
+- 2022-01-26 v1.5.3 cage ::
+
+  This version  fixed the  email maintainer  list that  was previously
+  confusing GNU ELPA building scripts.
+
+- 2022-01-26 v1.5.2 cage ::
 
   This version fixed a bug that prevented an annotation to be actually
   deleted when the only action on the  buffer was a single call of the
diff --git a/annotate.el b/annotate.el
index 6fd0bf6336..9617c2b686 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Bastian Bechtold <bastibe.dev@mailbox.org>, cage 
<cage-dev@twistfold.it>
 ;; URL: https://github.com/bastibe/annotate.el
 ;; Created: 2015-06-10
-;; Version: 1.5.2
+;; Version: 1.5.3
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "1.5.2"
+  :version "1.5.3"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -1206,12 +1206,11 @@ a        a**"
                     (setq prefix-first prefix-rest))))))
         (when (not annotate-use-echo-area)
           ;; build facespec with the annotation text as display property
-          (list 'face 'default 'display
-                (if (string= annotation-text "")
-                    ;; annotation has been removed: remove display prop
-                    nil
-                  ;; annotation has been changed/added: change/add display prop
-                  annotation-text))))))
+          (if (string= annotation-text "")
+              ;; annotation has been removed: remove display prop
+              (list 'face 'default 'display nil)
+            ;; annotation has been changed/added: change/add display prop
+            (list 'face 'default 'display annotation-text))))))
 
 (defun annotate--remove-annotation-property (_begin end)
   "Cleans up annotation properties associated within a region