[nongnu] elpa/annotate 7c39ccf838 5/5: Merge pull request #143 from cage2/fix-annotation-info-files

[ELPA Syncer]

branch: elpa/annotate
commit 7c39ccf838b87ba1ef7e7f775ad4e4423e323ce5
Merge: a92294e993 6c6946c6a5
Author: cage2 <1257703+cage2@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #143 from cage2/fix-annotation-info-files
    
    Restored annotation of info files.
---
 Changelog   | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 NEWS.org    |  6 ++++++
 annotate.el | 17 ++++++++-------
 3 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/Changelog b/Changelog
index 90ba40cd8f..1e6cc591ee 100644
--- a/Changelog
+++ b/Changelog
@@ -1,10 +1,72 @@
-022-10-20 cage
+2022-11-23 cage
 
-        * annotate.el:
+       * annotate.el:
+
+       - restored annotation of info files.
+       - renamed variable to respect a stylistic convention.
+       - do not skip 'annotate--remove-annotation-property' for narrowed
+       buffer.
+       Previously  the   function  above  just  skipped   narrowed  buffer,
+       effectively preventing delete of  annotation's text. This patch just
+       prevents the  function to try  to move  the cursor beyond  the buffer
+       limit that would leads to a crash.
+       The  test  for  narrowed  buffer was  added  because  command  like:
+       'comment-dwim' narrows the buffer beyond  the curtains, but my patch
+       was too  radical, this  changes supposed to  fix annotation  of info
+       files and does not interferes with 'comment-dwim'.
+
+2022-11-22 cage2
+
+
+       Merge pull request #140 from cage2/fix-tramp-crash
+
+2022-11-19 cage
+
+       * annotate.el:
+
+       - fixed logic of conditional test.
+
+2022-10-29 cage
+
+       * NEWS.org,
+       * annotate.el:
+
+       - prevented running  the function
+       'annotate--remove-annotation-property'
+       (tied to a string property) in a buffer where annotate-mode is null.
+       - increased version number and updated NEWS.org.
+       - mention user for their help.
+       - removed a redudant test for checking if a file is in info format.
+
+2022-10-24 cage2
+
+
+       Merge pull request #138 from cage2/fix-integrate-inplace
+
+2022-10-20 cage
+
+       * Changelog,
+       * NEWS.org,
+       * annotate.el:
+
+       - fixed  integration of  annotation when  the buffer  was modified  to
+       accommodate the annotations text;
+       - fixed typo.
+       - increased version number;
+       - updated NEWS.org and Changelog.
+
+2022-09-30 cage2
+
+
+       Merge pull request #137 from cage2/print-message-annotate-under-point
+
+2022-09-28 cage
+
+       * README.org,
+       * annotate.el:
 
-        - fixed  integration of  annotation when  the buffer  was modified  to
-        accommodate the annotations text;
-        - fixed typo.
+       - made delay before printing annotations on minibuffer customizable;
+       - updated README.org.
 
 2022-09-30 cage2
 
diff --git a/NEWS.org b/NEWS.org
index bbdb95b20d..4f30deeb20 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,9 @@
+- 2022-11-30 v1.8.3 cage ::
+
+  This versions fixed a bug that prevented annotations of info files.
+
+  Also opening of annotated remote files should be faster.
+
 - 2022-10-20 v1.8.2 cage ::
 
   This version fixed a crash that occurred when visiting an annotated
diff --git a/annotate.el b/annotate.el
index b5ae6e6f32..324afd4f12 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.8.2
+;; Version: 1.8.3
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "1.8.2"
+  :version "1.8.3"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -1330,8 +1330,7 @@ a        a**"
   "Cleans up annotation properties associated within a region
 surrounded by `BEGIN' and `END'."
   (when (and annotate-mode
-             (> (buffer-size) 0)
-             (not (buffer-narrowed-p)))
+             (> (buffer-size) 0))
     (with-silent-modifications
       (annotate-with-disable-read-only
        ;; copy undo list
@@ -1344,7 +1343,9 @@ surrounded by `BEGIN' and `END'."
            ;; annotated newline used to be
            (end-of-line)
            ;; strip dangling display property
-           (remove-text-properties (point) (1+ (point)) '(display nil)))
+           (when (< (1+ (point))
+                    (point-max))
+             (remove-text-properties (point) (1+ (point)) '(display nil))))
          ;; restore undo list
          (setf buffer-undo-list saved-undo-list)
          (buffer-enable-undo))))))
@@ -1728,9 +1729,9 @@ annotation."
   (let* ((short-filename  (annotate-filename-from-dump    record))
          (annotations     (annotate-annotations-from-dump record))
          (file-checksum   (annotate-checksum-from-dump    record))
-         (expand-p        (not (eq (ignore-errors (annotate-guess-file-format 
short-filename))
-                                   :info)))
-         (actual-filename (if expand-p
+         (expandp         (not (or (file-remote-p short-filename)
+                                   (annotate-info-root-dir-p short-filename))))
+         (actual-filename (if expandp
                               (expand-file-name short-filename)
                             short-filename)))
     (annotate-make-record actual-filename