branch: elpa/annotate
commit c72e730ba3b9202c57ee3ceeaeb9a85b12d44231
Author: cage <cage-invalid@invalid>
Commit: cage <cage-invalid@invalid>
- fixed annotation picking in 'annotate-annotate'
at the beginning of the function mentioned above we was picking the
first available overlay. So the annotated text contained multiple
overlays and an annotation was not the first we missed the last,
This means, for example, that the annotation was not modifiable;
- fixed some typos.
---
Changelog | 13 +++++++++++--
NEWS.org | 5 ++++-
annotate.el | 4 ++--
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Changelog b/Changelog
index edb5f8f61c..380978d404 100644
--- a/Changelog
+++ b/Changelog
@@ -10,7 +10,7 @@
positioning.
See the local function
'maybe-force-newline-policy' in 'annotate-create-annotation'.
- - choosen the window that contains the current buffer when resizing
the annotations
+ - chosen the window that contains the current buffer when resizing the
annotations
see variable 'current-window' in 'annotate-lineate';
- redraw buffer if one of its annotations is deleted
operating from the summary window.
@@ -50,7 +50,7 @@
- when re-flowing annotation the window width was calculated always
for the current buffer (the one with the focus).
-2020-04-06 Bastian Bechtold, cage
+2020-03-06 Bastian Bechtold, cage
* annotate.el
- each annotation (the overlay, actually) now has a property 'position
@@ -67,3 +67,12 @@
Please note that this changes impacted more or less the whole
package's code.
+
+2020-03-16 Bastian Bechtold, cage
+ * annotate.el (annotate-annotate)
+
+ - fixed annotation picking in 'annotate-annotate'
+ at the beginning of the function we was picking the first
+ available overlay. So the annotated text contained multiple
+ overlays and an annotation was not the first we missed the last,
+ This means, for example, that the annotation was not modifiable.
diff --git a/NEWS.org b/NEWS.org
index 20e4c55d96..d62ed59f45 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -101,5 +101,8 @@
file, if exists, to reflect the changes;
- fixed flowings of annotatinons when window's width is changed.
-- 2020-04-06 V0.6.0 Bastian Bechtold, cage ::
+- 2020-03-06 V0.6.0 Bastian Bechtold, cage ::
Fixed bugs of multiline annotations, diff exports and integration.
+
+- 2020-03-16 V0.6.1 Bastian Bechtold, cage ::
+ Fixed annotation picking in 'annotate-annotate'.
diff --git a/annotate.el b/annotate.el
index f7776b77c7..9222d09777 100644
--- a/annotate.el
+++ b/annotate.el
@@ -385,7 +385,7 @@ modified (for example a newline is inserted)."
(annotate-bounds)
(let ((annotation-text (read-from-minibuffer
annotate-annotation-prompt)))
(annotate-create-annotation start end annotation-text
nil)))))
- (let ((overlay (car (overlays-at (point)))))
+ (let ((annotation (annotate-annotation-at (point))))
(cond
((use-region-p)
(let ((annotations (cl-remove-if-not #'annotationp
@@ -394,7 +394,7 @@ modified (for example a newline is inserted)."
(if annotations
(message "Error: the region overlaps with at least an already
existings annotation")
(create-new-annotation))))
- ((annotationp overlay)
+ (annotation
(annotate-change-annotation (point))
(font-lock-fontify-buffer nil))
(t
