branch: elpa/annotate
commit 3458b548f455e1ac2768734ecd380bac2bcf509c
Author: cage <cage-invalid@invalid>
Commit: cage <cage-invalid@invalid>
- removed warning related to misplaced '(interactive)'
- removed warning because of expanding a macro that was defined later in
the code.
---
annotate.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/annotate.el b/annotate.el
index dbd56f521b..f938a2667e 100644
--- a/annotate.el
+++ b/annotate.el
@@ -474,6 +474,11 @@ modified (for example a newline is inserted)."
"Is 'overlay' an annotation?"
(annotate-overlay-filled-p overlay))
+(cl-defmacro annotate-ensure-annotation ((overlay) &body body)
+ "Runs body only if overlay is an annotation (i.e. passes annotationp)"
+ `(and (annotationp ,overlay)
+ (progn ,@body)))
+
(defun annotate--position-on-annotated-text-p (pos)
"Does `pos' (as buffer position) corresponds to a character
that belong to some annotated text?"
@@ -1420,9 +1425,9 @@ example:
'(\"/foo/bar\" ((0 9 \"note\" \"annotated\")) hash-as-hex-string)
"
+ (interactive)
(cl-labels ((old-format-p (annotation)
(not (stringp (cl-first (last annotation))))))
- (interactive)
(let* ((filename (annotate-actual-file-name))
(all-annotations-data (annotate-load-annotation-data t))
(annotation-dump (assoc-string filename all-annotations-data))
@@ -1637,11 +1642,6 @@ functions).
(or (null a)
(string= "" a)))
-(cl-defmacro annotate-ensure-annotation ((overlay) &body body)
- "Runs body only if overlay is an annotation (i.e. passes annotationp)"
- `(and (annotationp ,overlay)
- (progn ,@body)))
-
(defun annotate-annotation-prop-get (annotation property)
"Get property `property' from annotation `annotation'. If
`annotation' does not pass `annotationp' returns nil"
