[nongnu] elpa/annotate e982a7b74a 4/4: Merge pull request #129 from cage2/fix-resize-hook

[ELPA Syncer]

branch: elpa/annotate
commit e982a7b74a681a8c2c823d8dcaafd185ab5f719e
Merge: a3d42262f5 5299eba136
Author: cage2 <1257703+cage2@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #129 from cage2/fix-resize-hook
    
    Fix resize hook
---
 Changelog   | 10 ++++++++++
 NEWS.org    |  5 +++++
 annotate.el | 13 +++++++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index dd6d9add41..31112ee8b9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,13 @@
+2022-04-23 cage
+
+        * annotate.el:
+
+        - fixed  function that  is  called on  'window-size-change-functions',
+        this function is  called with a single frame as  an argument, whilst
+        we was using 'font-lock-flush' that takes two integer arguments.
+        The results was that the annotation was not properly resized.
+        - increased version number.
+
 2022-04-08 btd, cage
 
         * .gitignore,
diff --git a/NEWS.org b/NEWS.org
index b74ffd8ae0..31dc2a76a6 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,8 @@
+- 2022-04-23 v1.5.4 cage::
+
+  This version  restored redrawing  of annotation  when the  window is
+  resized.
+
 - 2022-01-26 v1.5.3 cage ::
 
   This version  fixed the  email maintainer  list that  was previously
diff --git a/annotate.el b/annotate.el
index 9617c2b686..b97a496761 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.3
+;; Version: 1.5.4
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -58,7 +58,7 @@
 ;;;###autoload
 (defgroup annotate nil
   "Annotate files without changing them."
-  :version "1.5.3"
+  :version "1.5.4"
   :group 'text)
 
 (defvar annotate-mode-map
@@ -432,13 +432,18 @@ modified (for example a newline is inserted)."
   (annotate-load-annotations)
   (font-lock-flush))
 
+(defun on-window-size-change (frame)
+  "The function to call when window-size-change-functions is called,
+note that the argument `FRAME' is ignored"
+  (font-lock-flush))
+
 (defun annotate-initialize ()
   "Load annotations and set up save and display hooks."
   (annotate-load-annotations)
   (add-hook 'after-save-hook                  #'annotate-save-annotations t t)
   ;; This hook  is needed to  reorganize the layout of  the annotation
   ;; text when a window vertically resized
-  (add-hook 'window-size-change-functions     #'font-lock-flush t t)
+  (add-hook 'window-size-change-functions     #'on-window-size-change t t)
   (add-hook 'before-change-functions          #'annotate-before-change-fn t t)
   (add-hook 'Info-selection-hook              #'annotate-info-select-fn   t t)
   (if annotate-use-echo-area
@@ -454,7 +459,7 @@ modified (for example a newline is inserted)."
   "Clear annotations and remove save and display hooks."
   (annotate-clear-annotations)
   (remove-hook 'after-save-hook                  #'annotate-save-annotations t)
-  (remove-hook 'window-size-change-functions     #'font-lock-flush t)
+  (remove-hook 'window-size-change-functions     #'on-window-size-change t)
   (remove-hook 'before-change-functions          #'annotate-before-change-fn t)
   (remove-hook 'Info-selection-hook              #'annotate-info-select-fn   t)
   (if annotate-use-echo-area