[nongnu] elpa/annotate d4eff870d9 292/372: Merge pull request #93 from cage2/master

[ELPA Syncer]

branch: elpa/annotate
commit d4eff870d9c1575731890acfdde89511d0322ec1
Merge: bc89867f65 401dab7723
Author: cage2 <1257703+cage2@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #93 from cage2/master
    
    prevented side effects of 'split-string'
---
 Changelog   |  7 +++++++
 NEWS.org    |  5 +++++
 annotate.el | 10 ++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 3dd166413c..ed05a988b3 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+2021-01-06  cage
+
+        * annotate.el:
+
+       - prevented side effects of 'split-string'.
+
+
 2020-12-23  cage
 
         * annotate.el:
diff --git a/NEWS.org b/NEWS.org
index f4b1379cfe..cfb3629261 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -177,3 +177,8 @@
 
   Related to the last  fix the variable ~annotate-diff-export-context~
   has been removed.
+
+* 2021-01-06 V1.1.1 Bastian Bechtold, cage ::
+
+  This version  fix an old bug  that causes many types  of issues with
+  rendering of annotations on the margin of the window.
diff --git a/annotate.el b/annotate.el
index c0a88bd091..582127d439 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.1.0
+;; Version: 1.1.1
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "1.1.0"
+  :version "1.1.1"
   :group 'text)
 
 ;;;###autoload
@@ -920,10 +920,12 @@ to 'maximum-width'."
                           (%group (append (list suffix)
                                           (cl-rest rest-words))
                                   (append (list prefix)
-                                          so-far)))))))
+                                          so-far))))))
+              (%split-words (text)
+                (save-match-data (split-string text " " t))))
     (if (< maximum-width 1)
         nil
-      (let* ((words   (split-string text " " t))
+      (let* ((words   (%split-words text))
              (grouped (reverse (%group words '()))))
         grouped))))