[nongnu] elpa/annotate a92294e993 6/6: Merge pull request #140 from cage2/fix-tramp-crash

[ELPA Syncer]

branch: elpa/annotate
commit a92294e993a01d05d3f16d18a8b9759becf3e673
Merge: 479aa90fd6 c5721f07a8
Author: cage2 <1257703+cage2@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #140 from cage2/fix-tramp-crash
    
    Fix tramp crash
---
 NEWS.org    |  8 ++++++++
 annotate.el | 15 +++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index 9f0f197e75..bbdb95b20d 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,11 @@
+- 2022-10-20 v1.8.2 cage ::
+
+  This version fixed a crash that occurred when visiting an annotated
+  buffer using TRAMP.
+
+  Thanks  to  gsingh93  for  discovering  the  bug  and  providing  an
+  immensely useful help.
+
 - 2022-10-20 v1.8.1 cage ::
 
   This version  fix the command  ~annotate-integrate-annotations~ that
diff --git a/annotate.el b/annotate.el
index f1488ba10d..b5ae6e6f32 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.1
+;; Version: 1.8.2
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "1.8.1"
+  :version "1.8.2"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -1329,7 +1329,8 @@ a        a**"
 (defun annotate--remove-annotation-property (_begin end)
   "Cleans up annotation properties associated within a region
 surrounded by `BEGIN' and `END'."
-  (when (and (> (buffer-size) 0)
+  (when (and annotate-mode
+             (> (buffer-size) 0)
              (not (buffer-narrowed-p)))
     (with-silent-modifications
       (annotate-with-disable-read-only
@@ -1740,7 +1741,7 @@ annotation."
   "Return a sexp from the annotation database contained in `FILE'."
   (with-temp-buffer
     (let* ((annotations-file file)
-           (attributes    (file-attributes annotations-file)))
+           (attributes       (file-attributes annotations-file)))
       (cond
        ((not (file-exists-p annotations-file))
         (signal 'annotate-db-file-not-found (list annotations-file)))
@@ -2481,10 +2482,8 @@ sophisticated way than plain text."
                                       (separator-re    "\^L?\^_\^L?\^J")
                                       (has-separator-p (string-match 
separator-re file-contents))
                                       (has-node-p      (string-match "Node:" 
file-contents)))
-                                 (if (or (annotate-info-root-dir-p filename)
-                                         (and has-separator-p
-                                              has-node-p)
-                                         (and has-separator-p
+                                 (if (and has-separator-p
+                                          (or has-node-p
                                               has-info-p))
                                      :info
                                    nil)))))