branch: elpa/annotate
commit dc6e884265c9de5b0e486b9f6bd9509a14b85c94
Merge: 2db6d5ef31 d9693f8dd2
Author: cage2 <1257703+ca...@users.noreply.github.com>
Commit: GitHub <nore...@github.com>
Merge pull request #173 from cage2/master
- fixed type definition of customiziable variables and docstrings
---
Changelog | 48 ++++++++-
Eask | 2 +-
NEWS.org | 6 +-
annotate.el | 322 ++++++++++++++++++++++++++++++------------------------------
4 files changed, 210 insertions(+), 168 deletions(-)
diff --git a/Changelog b/Changelog
index fa0205d33e..8a5371db9c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,11 +1,49 @@
+2025-05-14 cage
+
+ * annotate.el:
+
+ - fixed docstrings.
+
+2025-05-12 cage2
+
+ * annotate.el:
+
+ Merge pull request #172 from jcs-PR/ci/basic
+ - fixed type definition of customiziable variables related to font
+ faces of annotations, we can not know in advance the length of the
+ plists bound to these variables;
+ - fixed docstrings, only symbols names are wrapped in `…'.
+ - fixed docstrings.
+
+2025-05-10 cage2, JenChieh
+
+ * .github/workflows/test.yml,
+ * .gitignore,
+ * Eask,
+ * annotate.el:
+
+ Merge pull request #171 from cage2/master
+ ci: Add basic CI
+ fix: Set minimum version to 30.1
+ fix: snapshot warnings
+ fix: wrap info-setup
+ fix: indent issue and mix used of tab/spaces
+ fix: wrap entire info setup
+ fix: diff-buffers added after 27.1
+
2025-05-09 cage
- * annotate.el:
+ * Changelog,
+ * NEWS.org,
+ * annotate.el:
- - fixed type definition of customiziable variables related to font
- faces of annotations;
- - changed deprecated function related to info mode;
- - reformatted some docstrings to fit 80 columns limit.
+ - fixed type definition of customiziable variables related to font
+ faces of annotations;
+ - changed deprecated function related to info mode;
+ - reformatted some docstrings to fit 80 columns limit.
+ - increased version number;
+ - updated NEWS file;
+ - updated Changelog.
2025-05-07 cage
diff --git a/Eask b/Eask
index 0d9af6586c..541e4e8c10 100644
--- a/Eask
+++ b/Eask
@@ -1,7 +1,7 @@
;; -*- mode: eask; lexical-binding: t -*-
(package "annotate"
- "2.4.1"
+ "2.4.2"
"annotate files without changing them")
(website-url "https://github.com/bastibe/annotate.el";)
diff --git a/NEWS.org b/NEWS.org
index c13a0bb80c..8661e3d80a 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,6 +1,10 @@
+- 2025-05-09 v2.4.2 cage ::
+
+ This versions adds a CI system and boilerplate for adding unit testing to
annotate.el (thanks JenChieh!); also docstrings has been modified to be more
compliant to Emacs documentation standards.
+
- 2025-05-09 v2.4.1 cage ::
- This version reomoves the compilation warnings and makes easier to customize
the packacge.
+ This version removes the compilation warnings and makes easier to customize
the package.
- 2025-04-23 v2.4.0 cage ::
diff --git a/annotate.el b/annotate.el
index be99622935..767cd18e49 100644
--- a/annotate.el
+++ b/annotate.el
@@ -7,7 +7,7 @@
;; Maintainer: Bastian Bechtold <bastibe....@mailbox.org>, cage
<cage-...@twistfold.it>
;; URL: https://github.com/bastibe/annotate.el
;; Created: 2015-06-10
-;; Version: 2.4.1
+;; Version: 2.4.2
;; Package-Requires: ((emacs "27.1"))
;; This file is NOT part of GNU Emacs.
@@ -59,7 +59,7 @@
;;;###autoload
(defgroup annotate nil
"Annotate files without changing them."
- :version "2.4.1"
+ :version "2.4.2"
:group 'text)
(defvar annotate-mode-map
@@ -86,9 +86,9 @@ See https://github.com/bastibe/annotate.el/ for
documentation."
:type 'file)
(defcustom annotate-file-buffer-local nil
- "If non nil (default `nil'), for each annotated file `filename', a database
-`filename.notes', containing the annotations, is generated in the
-same directory that contains `filename'."
+ "If non nil (default `nil'), for each annotated file \"filename\", a database
+\"filename.notes\", containing the annotations, is generated in the
+same directory that contains \"filename\"."
:type 'string)
(defcustom annotate-buffer-local-database-extension "notes"
@@ -100,13 +100,13 @@ name of the local database annotation"
(:underline "#92EEF1")
(:underline "#F192EE"))
"List of faces for annotated text."
- :type '(repeat (list symbol string)))
+ :type '(repeat (plist)))
(defcustom annotate-annotation-text-faces '((:background "#EEF192"
:foreground "black")
(:background "#92EEF1"
:foreground "black")
(:background "#F192EE"
:foreground "black"))
"List of faces for annotation's text."
- :type '(repeat (list symbol string symbol string)))
+ :type '(repeat (plist)))
(defface annotate-prefix
'((t (:inherit default)))
@@ -118,10 +118,10 @@ This is the fill space between text lines and annotation
text.")
:type 'number)
(defcustom annotate-diff-export-options ""
- "Options passed to `diff' in `annotate-export-annotations'.
+ "Options passed to \"diff\" in `annotate-export-annotations'.
This is used when diffing between a buffer with and without
integrated annotations.
-Note that there is an implicit `-u' at the end of default options
+Note that there is an implicit \"-u\" at the end of default options
that Emacs passes to the diff program."
:type 'string)
@@ -143,7 +143,7 @@ annotated indirect buffer."
:type 'character)
(defcustom annotate-fallback-comment "#"
- "When variable `COMMENT-START' is nil use this string instead."
+ "When variable `comment-start' is nil use this string instead."
:type 'string)
(defcustom annotate-blacklist-major-mode '()
@@ -184,7 +184,7 @@ placed on the right margin of the window instead of its own
line
(defconst annotate-allowed-positioning-policy
'(:by-length :margin :new-line)
- "The allowed values for annotation positioning")
+ "The allowed values for annotation positioning.")
(defcustom annotate-annotation-position-policy :by-length
"Policy for annotation's position:
@@ -196,7 +196,7 @@ placed on the right margin of the window instead of its own
line
decide by text's length
if the length is more than the value of
-`ANNOTATE-ANNOTATION-MAX-SIZE-NOT-PLACE-NEW-LINE' place the
+`annotate-annotation-max-size-not-place-new-line' place the
annotation on a new line, place on the right margin
otherwise."
:type 'symbol)
@@ -269,7 +269,7 @@ others non printable characters are removed from both ends,
see:
The expression:
-(setf annotate-annotation-expansion-map
+\(setf annotate-annotation-expansion-map
\\='((\"%d\" \"date +%Y-%m-%d\" t)))
Will expand any occurrence of \"%d\" in the annotation's text with the
@@ -406,8 +406,7 @@ in the customizable colors lists:
'annotate-error)
(cl-defmacro annotate-with-disable-read-only (&body body)
- "Run `BODY' with `READ-ONLY-MODE' temporary disabled."
- (declare (indent 0))
+ "Run BODY with `read-only-mode' temporary disabled."
(let ((read-mode-p (gensym)))
`(let ((,read-mode-p (if buffer-read-only
1
@@ -442,7 +441,7 @@ See `annotate-blacklist-major-mode'."
(shutdown))))))
(cl-defun annotate-buffer-checksum (&optional (object (current-buffer)))
- "Calculate an hash for the argument `OBJECT'."
+ "Calculate an hash for the argument OBJECT."
(secure-hash 'md5 object))
(defun annotate-end-of-line-pos ()
@@ -458,71 +457,71 @@ position (so that it is unchanged after this function is
called)."
(point)))
(defun annotate-annotated-text-empty-p (annotation)
- "Does this `ANNOTATION' contains annotated text?"
+ "Does this ANNOTATION contains annotated text?"
(= (overlay-start annotation)
(overlay-end annotation)))
(defun annotate-annotation-set-face (annotation face)
- "Set property face to `FACE' for `ANNOTATION'."
+ "Set property face to FACE for ANNOTATION."
(overlay-put annotation 'face face))
(defun annotate-annotation-face (annotation)
- "Get property face from `ANNOTATION'."
+ "Get property face from ANNOTATION."
(overlay-get annotation 'face))
(defun annotate-annotation-set-annotation-face (annotation face)
- "Set property annotation-face to `FACE' for `ANNOTATION'."
+ "Set property annotation-face to FACE for ANNOTATION."
(overlay-put annotation 'annotation-face face))
(defun annotate-annotation-property-annotation-face (annotation)
- "Get property annotation-face from `ANNOTATION'."
+ "Get property annotation-face from ANNOTATION."
(overlay-get annotation 'annotation-face))
(defun annotate-annotation-set-annotation-text (annotation annotation-text)
- "Set the annotation's content for `ANNOTATION` to `ANNOTATION-TEXT`."
+ "Set the annotation's content for ANNOTATION to ANNOTATION-TEXT."
(overlay-put annotation 'annotation annotation-text))
(defun annotate-annotation-get-annotation-text (annotation)
- "Get the annotation's content for `ANNOTATION`."
+ "Get the annotation's content for ANNOTATION."
(overlay-get annotation 'annotation))
(defun annotate-annotation-set-position (annotation position)
- "Set the annotation's position policy for `ANNOTATION'
-to the value bound to `POSITION'."
+ "Set the annotation's position policy for ANNOTATION
+to the value bound to POSITION."
(overlay-put annotation 'annotate-position position))
(defun annotate-annotation-get-position (annotation)
- "Get the annotation's position policy for `ANNOTATION'."
+ "Get the annotation's position policy for ANNOTATION."
(overlay-get annotation 'annotate-position))
(defun annotate-overlay-maybe-set-position (overlay position)
- "Set the annotation's position policy for `ANNOTATION' to the value bound
-to `POSITION',but only if the value of the property \\='position is not null."
+ "Set the annotation's position policy for OVERLAY to the value bound
+to POSITION,but only if the value of the property `position' is not null."
(when position
(annotate-annotation-set-position overlay position)))
(defun annotate-chain-last-ring (chain)
- "Get the last ring of `CHAIN'."
+ "Get the last ring of CHAIN."
(car (last chain)))
(defun annotate--remap-chain-pos (annotations)
- "Remap `ANNOTATIONS' as an annotation \"chain\".
+ "Remap ANNOTATIONS as an annotation \"chain\".
An annotation is a collection of one or more overlays that
-contains the property `ANNOTATE-PROP-CHAIN-POSITION'.
+contains the property `annotate-prop-chain-position'.
-The value of `ANNOTATE-PROP-CHAIN-POSITION' in each chain is an
+The value of `annotate-prop-chain-position' in each chain is an
integer starting from:
-`ANNOTATE-PROP-CHAIN-POS-MARKER-FIRST' and *always* ending with
+`annotate-prop-chain-pos-marker-first' and *always* ending with
-`ANNOTATE-PROP-CHAIN-POS-MARKER-LAST'
+`annotate-prop-chain-pos-marker-last'
This means that a value of said property for a chain that
contains only an element is equal to
-`ANNOTATE-PROP-CHAIN-POS-MARKER-LAST'.
+`annotate-prop-chain-pos-marker-last'.
-This function ensure this constrains for the chain `ANNOTATION'
+This function ensure this constrains for the chain ANNOTATION
belong."
(cond
((< (length annotations)
@@ -575,11 +574,11 @@ modified (for example a newline is inserted)."
(defun on-window-size-change (_frame)
"The function to call when window-size-change-functions is called,
-note that the argument `FRAME' is ignored"
+note that the argument _FRAME is ignored"
(font-lock-flush))
(defun annotate--filepath->local-database-name (filepath)
- "Generates the file path of the local database form `FILEPATH'."
+ "Generates the file path of the local database form FILEPATH."
(concat (file-name-nondirectory filepath)
"."
annotate-buffer-local-database-extension))
@@ -670,23 +669,22 @@ Used when the mode is deactivated."
(1 (annotate--change-guard)))))))
(defun annotate-overlay-filled-p (overlay)
- "Does this `OVERLAY' contains an \"annotation\" property?"
+ "Does this OVERLAY contains an `annotation' property?"
(and overlay
(overlayp overlay)
(annotate-annotation-get-annotation-text overlay)))
(defun annotationp (overlay)
- "Is `OVERLAY' an annotation?"
+ "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)."
- (declare (indent 1))
+ "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
+ "Does POS (as buffer position) corresponds to a character
that belong to some annotated text?"
(let ((annotation (annotate-annotation-at pos)))
(if annotation
@@ -740,18 +738,20 @@ that belong to some annotated text?"
(defun annotate-delete-chains-in-region (from to)
"Deletes all the chains enclosed in the range specified by
-positions `FROM' and `TO'."
+positions FROM and TO."
(let* ((enclosed-chains (annotate-annotations-chain-in-range from to)))
(dolist (chain enclosed-chains)
(annotate--delete-annotation-chain (cl-first chain)))))
(defun annotate-count-newline-in-region (from to)
"Counts the number of newlines character (?\n) in range
-specified by `FROM' and `TO'."
+specified by FROM and TO."
(cl-count-if (lambda (a) (char-equal a ?\n))
(buffer-substring-no-properties from to)))
(defun annotate--expand-annotation-text (annotation-text)
+ "Expand substrings of ANNOTATION-TEXT, using rules defined in the variable in
+`in annotate-annotation-expansion-map'."
(cl-flet ((regex (expansion-item)
(cl-first expansion-item))
(trimp (expansion-item)
@@ -774,7 +774,7 @@ specified by `FROM' and `TO'."
(defun annotate-annotate (&optional color-index)
"Create, modify, or delete annotation.
-if `COLOR-INDEX' is not null must be an index that adresses an element both in
+if COLOR-INDEX is not null must be an index that adresses an element both in
- `annotate-highlight-faces'
and
- `annotate-annotation-text-faces'"
@@ -1201,13 +1201,13 @@ annotation, and can be conveniently viewed in
diff-mode."
- the area between the overlay and the annotation
- the newline that will display the annotation
-The first match will get `ANNOTATE--CHANGE-GUARD' as its
-`INSERT-IN-FRONT-HOOK', to make sure that if a newline is inserted
+The first match will get `annotate--change-guard' as its
+`insert-in-front-hook', to make sure that if a newline is inserted
between the overlay and the annotation, the \"display\" property of
the newline is properly disposed of.
-The second match will get `ANNOTATE--ANNOTATION-BUILDER' as its
-\"display\" property, which makes the newline look like an
+The second match will get `annotate--annotation-builder' as its
+`display' property, which makes the newline look like an
annotation plus the newline."
(goto-char (next-overlay-change (point)))
(if (>= (point) limit)
@@ -1234,8 +1234,8 @@ annotation plus the newline."
start-word)
(defun annotate-group-by-width (text maximum-width)
- "Groups `TEXT' in a list formed by chunks of maximum size equal
-to `MAXIMUM-WIDTH'."
+ "Groups TEXT in a list formed by chunks of maximum size equal
+to MAXIMUM-WIDTH."
(cl-labels ((next-word (words)
(or (cl-first words)
""))
@@ -1307,8 +1307,8 @@ to `MAXIMUM-WIDTH'."
grouped))))
(cl-defun annotate-safe-subseq (seq from to &optional (value-if-limits-invalid
seq))
- "Return a substring of `SEQ' or `VALUE-IF-LIMITS-INVALID'
-sequence if `FROM' or `TO' are invalids."
+ "Return a substring of SEQ or VALUE-IF-LIMITS-INVALID
+sequence if FROM or TO are invalids."
(cond
((< to from)
value-if-limits-invalid)
@@ -1320,7 +1320,7 @@ sequence if `FROM' or `TO' are invalids."
(cl-subseq seq from to))))
(defun annotate-lineate (text line-width)
- "Breaks `TEXT' into lines to fit in the annotation space with width
`LINE-WIDTH'."
+ "Breaks TEXT into lines to fit in the annotation space with width
LINE-WIDTH."
(cl-labels ((pad (string max-width add-newline-p)
(if (null string)
""
@@ -1358,12 +1358,12 @@ sequence if `FROM' or `TO' are invalids."
(list (pad last-line max-width nil)))))))
(cl-defun annotate--split-lines (text &optional (separator "\n"))
- "Return `TEXT' splitted by `SEPARATOR' (default: \"\n\")."
+ "Return TEXT splitted by SEPARATOR (default: \"\n\")."
(save-match-data
(split-string text separator)))
(defun annotate--join-with-string (strings junction)
- "Join list of string in `STRINGS' using string `JUNCTION'."
+ "Join list of string in STRINGS using string JUNCTION."
(cl-reduce (lambda (a b) (concat a junction b))
strings))
@@ -1372,12 +1372,12 @@ sequence if `FROM' or `TO' are invalids."
end-of-line
annotation-on-is-own-line-p)
"Pads or breaks annotation text (as property of
-`ANNOTATION-OVERLAY' so that all lines have the same width.
+ANNOTATION-OVERLAY so that all lines have the same width.
If annotation is a placed on the margin of a window (that is
-`ANNOTATION-ON-IS-OWN-LINE-P' is
+ANNOTATION-ON-IS-OWN-LINE-P is
nil) the text is broken (regardless of words) to fit on the side
-of the window using `BEGIN-OF-LINE' `END-OF-LINE'.
+of the window using BEGIN-OF-LINE END-OF-LINE.
If annotation is a note that is placed in its own line the text is padded
with spaces so that a \"box\" surround the text without seams, e.g:
@@ -1522,7 +1522,7 @@ a a**"
(defun annotate--remove-annotation-property (_begin end)
"Cleans up annotation properties associated within a region
-surrounded by `BEGIN' and `END'."
+surrounded by _BEGIN and END."
(when (and annotate-mode
(> (buffer-size) 0))
(with-silent-modifications
@@ -1546,7 +1546,7 @@ surrounded by `BEGIN' and `END'."
(defun annotate-annotations-overlay-in-range (from-position to-position)
"Return the annotations overlays that are enclosed in the range
-defined by `FROM-POSITION' and `TO-POSITION'."
+defined by FROM-POSITION and TO-POSITION."
(let ((annotations ())
(counter (max 0 (1- from-position))))
(catch 'scan-loop
@@ -1566,7 +1566,7 @@ defined by `FROM-POSITION' and `TO-POSITION'."
(defun annotate-annotations-chain-in-range (from-position to-position)
"Return the annotations (chains) that are enclosed in the range
-defined by `FROM-POSITION' and `TO-POSITION'."
+defined by FROM-POSITION and TO-POSITION."
(let ((annotations (annotate-annotations-overlay-in-range from-position
to-position))
(chains ()))
(cl-loop for annotation in annotations do
@@ -1575,8 +1575,8 @@ defined by `FROM-POSITION' and `TO-POSITION'."
(reverse chains)))
(defun annotate--change-guard ()
- "Return a `facespec` with an `insert-behind-hooks` property
-that strips dangling `display` properties of text insertions if
+ "Return a `facespec' with an `insert-behind-hooks' property
+that strips dangling `display' properties of text insertions if
text is inserted. This cleans up after newline insertions between
an overlay and it's annotation."
(list 'face
@@ -1585,8 +1585,8 @@ an overlay and it's annotation."
'(annotate--remove-annotation-property)))
(defun annotate-prefix-lines (prefix text &optional omit-trailing-null)
- "Prepend `PREFIX' to each line in `TEXT'.
-If `OMIT-TRAILING-NULL' is non null, empty line at the end of
+ "Prepend PREFIX to each line in TEXT.
+If OMIT-TRAILING-NULL is non null, empty line at the end of
text will be discarded."
(let ((lines (annotate--split-lines text "\n")))
(when omit-trailing-null
@@ -1604,7 +1604,7 @@ buffer is not on info-mode"
(annotate-guess-filename-for-dump Info-current-file nil))
(cl-defun annotate-indirect-buffer-p (&optional (buffer (current-buffer)))
- "Returns non nil if `BUFFER' (default the current buffer) is an indirect
buffer."
+ "Returns non nil if BUFFER (default the current buffer) is an indirect
buffer."
(buffer-base-buffer buffer))
(defun annotate-indirect-buffer-current-p ()
@@ -1624,7 +1624,7 @@ buffer is not on info-mode"
(cl-defun annotate-guess-filename-for-dump (filename
&optional
(return-filename-if-not-found-p t))
- "Guess an acceptable file name suitable for metadata database from
`FILENAME'."
+ "Guess an acceptable file name suitable for metadata database from FILENAME."
(cond
((annotate-string-empty-p filename)
nil)
@@ -1643,7 +1643,7 @@ buffer is not on info-mode"
found))))
(defun annotate-make-annotation-dump-entry (filename file-annotations checksum)
- "Make an annotation record: see `ANNOTATE-LOAD-ANNOTATIONS'."
+ "Make an annotation record: see `annotate-load-annotations'."
(list filename
file-annotations
checksum))
@@ -1681,29 +1681,29 @@ file."
(cl-first record))
(defun annotate-beginning-of-annotation (annotation)
- "Get the starting point of an annotation. The arg \"annotation\" must be a
single
+ "Get the starting point of an annotation. The arg ANNOTATION must be a single
annotation field got from a file dump of all annotated buffers,
essentially what you get from:
\(annotate-annotations-from-dump (nth index (annotate-load-annotations))))."
(cl-first annotation))
(defun annotate-ending-of-annotation (annotation)
- "Get the ending point of an annotation. The arg \"annotation\" must be a
single
+ "Get the ending point of an annotation. The arg ANNOTATION must be a single
annotation field got from a file dump of all annotated buffers,
essentially what you get from:
\(annotate-annotations-from-dump (nth index (annotate-load-annotations))))."
(cl-second annotation))
(defun annotate--interval-left-limit (a)
- "Given an annotation record `A' returns the left limit of the annotated
text."
+ "Given an annotation record A returns the left limit of the annotated text."
(cl-first a))
(defun annotate--interval-right-limit (a)
- "Given an annotation record `A' returns the right limit of the annotated
text."
+ "Given an annotation record A returns the right limit of the annotated text."
(cl-second a))
(defun annotate--make-interval (left-limit right-limit)
- "Make an interval from `LEFT-LIMIT' and `RIGHT-LIMIT'."
+ "Make an interval from LEFT-LIMIT and RIGHT-LIMIT."
(list left-limit right-limit))
(defun annotate-annotation-interval (annotation)
@@ -1723,14 +1723,14 @@ the right side."
(1- (annotate-ending-of-annotation annotation))))
(defun annotate-annotation-string (annotation)
- "Get the text of an annotation. The arg \"annotation\" must be a single
+ "Get the text of an annotation. The arg ANNOTATION must be a single
annotation field got from a file dump of all annotated buffers,
essentially what you get from:
\(annotate-annotations-from-dump (nth index (annotate-load-annotations))))."
(nth 2 annotation))
(defun annotate-annotated-text (annotation)
- "Get the annotated text of an annotation. The arg `ANNOTATION' must be a
single
+ "Get the annotated text of an annotation. The arg ANNOTATION must be a single
annotation field got from a file dump of all annotated buffers,
essentially what you get from:
\(annotate-annotations-from-dump (nth index (annotate-load-annotations))))."
@@ -1746,7 +1746,7 @@ essentially what you get from:
(cl-defun annotate--dump-indirect-buffer (annotations &optional
(indirect-buffer (current-buffer)))
"Clone an annotated indirect buffer into a new buffer.
-`ANNOTATIONS' containd the annotations and `INDIRECT-BUFFER'
+ANNOTATIONS containd the annotations and INDIRECT-BUFFER
\(default the current buffer) is the buffer to be cloned."
(when annotations
(let* ((new-buffer-name (generate-new-buffer-name (concat (buffer-name
indirect-buffer)
@@ -1929,7 +1929,7 @@ example:
(message annotate-message-annotation-loaded))))))
(defun annotate-db-clean-records (records-db)
- "Remove records from arg `RECORDS-DB' that have empty annotation, example:
+ "Remove records from arg RECORDS-DB that have empty annotation, example:
\\='((\"/foo/bar.dat\" nil \"abababababababababababababab\")
(\"/foo/baz.dat\" ((0 9 \"note\" \"annotated\"))
\"abababababababababababababab\"))
@@ -1950,7 +1950,7 @@ annotation."
(annotate-dump-annotation-data db)))
(defun annotate--expand-record-path (record)
- "Expand file component of `RECORD'."
+ "Expand file component of RECORD."
(let* ((short-filename (annotate-filename-from-dump record))
(annotations (annotate-annotations-from-dump record))
(file-checksum (annotate-checksum-from-dump record))
@@ -1964,7 +1964,7 @@ annotation."
file-checksum)))
(defun annotate--deserialize-database-file (file)
- "Return a sexp from the annotation database contained in `FILE'."
+ "Return a sexp from the annotation database contained in FILE."
(with-temp-buffer
(let* ((annotations-file file)
(attributes (file-attributes annotations-file)))
@@ -1985,7 +1985,7 @@ annotation."
(annotate--deserialize-database-file annotate-file)))
(defun annotate-dump-annotation-data (data &optional save-empty-db)
- "Save `DATA' into annotation file."
+ "Save DATA into annotation file."
(cond
((or save-empty-db
data)
@@ -2030,9 +2030,9 @@ annotation."
record-filename
annotation-beginning
annotation-ending)
- "Remove from database `DB-RECORDS' the annotation identified by
-the triplets `RECORD-FILENAME', `ANNOTATION-BEGINNING' and
- `ANNOTATION-ENDING'; if such annotation does exists."
+ "Remove from database DB-RECORDS the annotation identified by
+the triplets RECORD-FILENAME, ANNOTATION-BEGINNING and
+ ANNOTATION-ENDING; if such annotation does exists."
(with-matching-annotation-fns
(record-filename
annotation-beginning
@@ -2055,9 +2055,9 @@ the triplets `RECORD-FILENAME', `ANNOTATION-BEGINNING' and
annotation-beginning
annotation-ending
replacing-text)
- "Replace the text of annotation from database `DB-RECORDS'
-identified by the triplets `RECORD-FILENAME',
- `ANNOTATION-BEGINNING' and `ANNOTATION-ENDING'; if such
+ "Replace the text of annotation from database DB-RECORDS
+identified by the triplets RECORD-FILENAME,
+ ANNOTATION-BEGINNING and ANNOTATION-ENDING; if such
annotation does exists."
(with-matching-annotation-fns
(record-filename
@@ -2086,7 +2086,7 @@ identified by the triplets `RECORD-FILENAME',
db-records))))
(defun annotate-db-annotations-starts-before-p (a b)
- "Non nil if annotation `A' starts before `B'.
+ "Non nil if annotation A starts before B.
In this context annotation means annotation loaded from local
database not the annotation shown in the buffer (therefore these
@@ -2111,13 +2111,13 @@ functions)."
(delete-overlay ov))))
(defun annotate-string-empty-p (a)
- "Is the arg `A' an empty string or null?"
+ "Is the arg A an empty string or null?"
(or (null a)
(string= "" a)))
(defun annotate-annotation-prop-get (annotation property)
- "Get property `PROPERTY' from annotation `ANNOTATION'. If
-`ANNOTATION' does not pass `annotationp' returns nil."
+ "Get property PROPERTY from annotation ANNOTATION. If
+ANNOTATION does not pass `annotationp' returns nil."
(annotate-ensure-annotation (annotation)
(overlay-get annotation property)))
@@ -2132,13 +2132,13 @@ in a chain of annotations."
(overlay-put annotation annotate-prop-chain-position pos))
(defun annotate-chain-last-p (annotation)
- "Non nil if `ANNOTATION' is the last element of a chain of annotations."
+ "Non nil if ANNOTATION is the last element of a chain of annotations."
(let ((value (annotate-annotation-get-chain-position annotation)))
(and value
(cl-equalp value annotate-prop-chain-pos-marker-last))))
(defun annotate-chain-first-p (annotation)
- "Non nil if `ANNOTATION' is the first element, or the only
+ "Non nil if ANNOTATION is the first element, or the only
of a chain of annotations."
(let* ((chain-pos (annotate-annotation-get-chain-position
annotation))
(annotation-start (overlay-start annotation))
@@ -2153,7 +2153,7 @@ of a chain of annotations."
annotate-prop-chain-pos-marker-last))))))
(defun annotate-chain-first (annotation)
- "Find first element of the chain where `ANNOTATION' belongs."
+ "Find first element of the chain where ANNOTATION belongs."
(cond
((null annotation)
nil)
@@ -2165,7 +2165,7 @@ of a chain of annotations."
(annotate-chain-first previous-annotation)))))
(defun annotate-chain-last (annotation)
- "Find last element of the chain where `ANNOTATION' belongs."
+ "Find last element of the chain where ANNOTATION belongs."
(cond
((null annotation)
nil)
@@ -2177,19 +2177,19 @@ of a chain of annotations."
(annotate-chain-last next-annotation)))))
(defun annotate-chain-first-at (pos)
- "Find first element of the chain of annotation that overlap point `POS'."
+ "Find first element of the chain of annotation that overlap point POS."
(let ((annotation (annotate-annotation-at pos)))
(annotate-ensure-annotation (annotation)
(annotate-chain-first annotation))))
(defun annotate-chain-last-at (pos)
- "Find last element of the chain of annotation that overlap point `POS'."
+ "Find last element of the chain of annotation that overlap point POS."
(let ((annotation (annotate-annotation-at pos)))
(annotate-ensure-annotation (annotation)
(annotate-chain-last annotation))))
(defun annotate-chain-at (pos)
- "Find the chain of overlays where point `POS' belongs."
+ "Find the chain of overlays where point POS belongs."
(let ((annotation (annotate-annotation-at pos)))
(annotate-ensure-annotation (annotation)
(annotate-find-chain annotation))))
@@ -2205,7 +2205,7 @@ in a chain of annotations as last."
(annotate-annotation-chain-position annotation
annotate-prop-chain-pos-marker-last))
(defun annotate-find-chain (annotation)
- "Find all ANNOTATION that are parts of the chain where `ANNOTATION' belongs."
+ "Find all ANNOTATION that are parts of the chain where ANNOTATION belongs."
(annotate-ensure-annotation (annotation)
(cl-labels ((find-next-annotation (pos)
(annotate-annotation-at (next-overlay-change pos))))
@@ -2229,45 +2229,45 @@ in a chain of annotations as last."
(reverse results))))))
(defun annotate-annotations-chain-at (pos)
- "Find all annotation that are parts of the chain that overlaps at `POS'."
+ "Find all annotation that are parts of the chain that overlaps at POS."
(annotate-find-chain (annotate-annotation-at pos)))
(defun annotate-chain-hide-text (chain)
- "Sets an overlay properties of the last ring of `CHAIN' so that
+ "Sets an overlay properties of the last ring of CHAIN so that
the annotation's text will not be rendered."
(let ((last-ring (annotate-chain-last-ring chain)))
(overlay-put last-ring 'hide-text t)))
(defun annotate-chain-show-text (chain)
- "Sets an overlay properties of the last ring of `CHAIN' so that
+ "Sets an overlay properties of the last ring of CHAIN so that
the annotation's text will be rendered."
(let ((last-ring (annotate-chain-last-ring chain)))
(overlay-put last-ring 'hide-text nil)))
(defun annotate-chain-hide-text-p (chain)
- "Non nil if the annotation's text contained in the last ring of `CHAIN'
+ "Non nil if the annotation's text contained in the last ring of CHAIN
must not be rendered."
(let ((last-ring (annotate-chain-last (cl-first chain))))
(annotate-tail-overlay-hide-text-p last-ring)))
(defun annotate-tail-overlay-hide-text-p (overlay)
- "Get the property for hiding the annotation text from `OVERLAY'."
+ "Get the property for hiding the annotation text from OVERLAY."
(overlay-get overlay 'hide-text))
(defun annotate-create-annotation (start end annotation-text annotated-text
&optional color-index position)
- "Create a new annotation for selected region (from `START' to `END'.
+ "Create a new annotation for selected region (from START to END.
-Here the argument `ANNOTATION-TEXT' is the string that appears
-on the margin of the window and \"annotated-text\" is the string
+Here the argument ANNOTATION-TEXT is the string that appears
+on the margin of the window and ANNOTATED-TEXT is the string
that is underlined.
If this function is called from procedure
-\"annotate-load-annotations\" the argument `ANNOTATED-TEXT'
+`annotate-load-annotations' the argument ANNOTATED-TEXT
should be not null. In this case we know that an annotation
existed in a text interval defined in the database
metadata (the database located in the file specified by the
-variable \"annotate-file\") and should just be
+variable `annotate-file') and should just be
restored. Sometimes the annotated text (see above) can not be
found in said interval because the annotated file's content
changed and `annotate-mode' could not track the
@@ -2279,12 +2279,12 @@ interval and, if found, the buffer is annotated right
there.
The searched interval can be customized setting the variable:
\"annotate-search-region-lines-delta\".
-`COLOR-INDEX`, if non-null (default nil), is used as index to address
-elements both in `annotate-color-index-from-dump'
-and `annotate-color-index-from-dump' to specify annotation appearance.
+COLOR-INDEX, if non-null (default nil), is used as index to address
+elements both in ANNOTATE-COLOR-INDEX-FROM-DUMP
+and ANNOTATE-COLOR-INDEX-FROM-DUMP to specify annotation appearance.
-Finally `POSITION` indicates the positioning policy for the annotation,
-if null the value bound to `annotate-annotation-position-policy' is
+Finally POSITION indicates the positioning policy for the annotation,
+if null the value bound to ANNOTATE-ANNOTATION-POSITION-POLICY is
used."
(cl-labels ((face-annotation-shifting-point (position
shifting-direction-function)
(when-let* ((annotation (funcall
shifting-direction-function
@@ -2461,23 +2461,23 @@ used."
(font-lock-fontify-block 1))))))
(defun annotate-overlay-put-echo-help (overlay text)
- "Set the property `HELP-ECHO' to `TEXT' in overlay `OVERLAY'."
+ "Set the property `help-echo' to TEXT in overlay OVERLAY."
(overlay-put overlay 'help-echo text))
(defun annotate-overlay-get-echo-help (overlay)
- "Set the property `HELP-ECHO' from overlay `OVERLAY'."
+ "Set the property `help-echo' from overlay OVERLAY."
(overlay-get overlay 'help-echo))
(defun annotate-overlay-maybe-set-help-echo (overlay annotation-text)
- "Set the property `HELP-ECHO' to `TEXT' in overlay `OVERLAY' if
+ "Set the property `help-echo' to ANNOTATION-TEXT in overlay OVERLAY if
the annotations should be shown in a popup fashion.
-See the variable: `ANNOTATE-USE-ECHO-AREA'."
+See the variable: `annotate-use-echo-area'."
(when annotate-use-echo-area
(annotate-overlay-put-echo-help overlay annotation-text)))
(defun annotate--delete-annotation-chain (annotation)
- "Delete `ANNOTATION' from a buffer and the chain it belongs to.
+ "Delete ANNOTATION from a buffer and the chain it belongs to.
This function is not part of the public API."
(annotate-ensure-annotation (annotation)
@@ -2493,7 +2493,7 @@ This function is not part of the public API."
(delete-overlay single-element)))))))
(defun annotate--delete-annotation-chain-ring (annotation-ring)
- "Delete overlay of `ANNOTATION-RING' from a buffer.
+ "Delete overlay of ANNOTATION-RING from a buffer.
A ring is a single element of an annotation chain.
@@ -2508,7 +2508,7 @@ This function is not part of the public API."
(defun annotate-delete-chain-element (annotation)
"Delete a ring (a ring is a single element of an ANNOTATION chain.)
-from a chain where `ANNOTATION' belong."
+from a chain where ANNOTATION belong."
(annotate-ensure-annotation (annotation)
(let* ((chain (annotate-find-chain annotation))
(first-of-chain-p (annotate-chain-first-p annotation))
@@ -2526,7 +2526,7 @@ from a chain where `ANNOTATION' belong."
(annotate-annotation-set-chain-last annotation-before))))))))
(defun annotate--cut-left-annotation (annotation)
- "Trims `ANNOTATION' exactly one character from the start."
+ "Trims ANNOTATION exactly one character from the start."
(annotate-ensure-annotation (annotation)
(let* ((chain (annotate-find-chain annotation))
(first-annotation (annotate-chain-first annotation))
@@ -2544,7 +2544,7 @@ from a chain where `ANNOTATION' belong."
(move-overlay first-annotation new-starting-pos
first-annotation-ending-pos))))))
(defun annotate--cut-right-annotation (annotation &optional refontify-buffer)
- "Trims `ANNOTATION' exactly one character from the end."
+ "Trims ANNOTATION exactly one character from the end."
(annotate-ensure-annotation (annotation)
(let* ((chain (annotate-find-chain annotation))
(last-annotation (annotate-chain-last annotation))
@@ -2579,7 +2579,7 @@ This function is not part of the public API."
(y-or-n-p annotate-confirm-deleting-annotation-prompt)))
(cl-defun annotate-delete-annotation (&optional (point (point)))
- "Command to delete an annotation, `POINT' is the buffer
+ "Command to delete an annotation, POINT is the buffer
position where to look for annotation (default the cursor
point)."
(interactive)
@@ -2597,7 +2597,7 @@ This function is not part of the public API."
(y-or-n-p (format annotate-confirm-appending-newline-prompt (buffer-name))))
(defun annotate-change-annotation (pos)
- "Change annotation at `POS'. If empty, delete annotation."
+ "Change annotation at POS. If empty, delete annotation."
(let* ((highlight (annotate-annotation-at pos))
(annotation-text (read-from-minibuffer annotate-annotation-prompt
(annotate-annotation-get-annotation-text highlight))))
@@ -2632,7 +2632,7 @@ This function is not part of the public API."
(defun annotate-annotation-at (pos)
"Return the annotations (overlay where (annotationp overlay) -> t)
-at positions `POS' or nil if no annotations exists at pos.
+at positions POS or nil if no annotations exists at pos.
NOTE this assumes that annotations never overlaps so the list of
all annotations can contains only one element maximum."
@@ -2641,7 +2641,7 @@ all annotations can contains only one element maximum."
(cl-first all)))
(defun annotate-previous-annotation-ends (pos)
- "Return the previous annotation that ends before `POS' or nil if no
annotation
+ "Return the previous annotation that ends before POS or nil if no annotation
was found.
NOTE this assumes that annotations never overlaps."
(cl-labels ((previous-annotation-ends (start)
@@ -2658,12 +2658,12 @@ NOTE this assumes that annotations never overlaps."
(previous-annotation-ends pos)))))
(defun annotate-previous-annotation (annotation)
- "Return the annotation before `ANNOTATIONS' or nil if no such
+ "Return the annotation before ANNOTATIONS or nil if no such
annotation exists."
(annotate-previous-annotation-ends (overlay-start (annotate-chain-first
annotation))))
(defun annotate-next-annotation-starts (pos)
- "Return the next annotation that starts after `POS' or nil if no annotation
+ "Return the next annotation that starts after POS or nil if no annotation
was found.
NOTE this assumes that annotations never overlaps."
(cl-labels ((next-annotation-ends (start)
@@ -2680,13 +2680,13 @@ NOTE this assumes that annotations never overlaps."
(next-annotation-ends pos)))))
(defun annotate-next-annotation (annotation)
- "Return the annotation after `ANNOTATIONS' or nil if no such
+ "Return the annotation after ANNOTATIONS or nil if no such
annotation exists."
(annotate-next-annotation-starts (overlay-end (annotate-chain-last
annotation))))
(defun annotate-symbol-strictly-at-point ()
"Return non nil if a symbol is at char immediately following
-the point. This is needed as `THING-AT-POINT' family of
+the point. This is needed as `thing-at-point' family of
functions returns non nil if the thing (a symbol in this case)
is around the point, according to the documentation."
(cl-labels ((after-point ()
@@ -2741,8 +2741,8 @@ the point. This is needed as `THING-AT-POINT' family of
(defun annotate-make-annotation (beginning ending annotation annotated-text)
"Make an annotation record that represent an annotation
-starting at `BEGINNING', terminate at `ENDING' with annotation
-content `ANNOTATION' and annotated text `ANNOTATED-TEXT'."
+starting at BEGINNING, terminate at ENDING with annotation
+content ANNOTATION and annotated text ANNOTATED-TEXT."
(list beginning ending annotation annotated-text))
(defun annotate-all-annotations ()
@@ -2779,12 +2779,12 @@ The format is suitable for database dump."
all-annotations))))
(defun annotate-info-root-dir-p (filename)
- "Is the name of this file (`FILENAME') equals to the info root node?"
+ "Is the name of this file (FILENAME) equals to the info root node?"
(string= filename
annotate-info-root-name))
(defun annotate-guess-file-format (filename)
- "Try to guess the file format from `FILENAME'.
+ "Try to guess the file format from FILENAME.
Non nil if the file format is supported from \"annotate\" in a more
sophisticated way than plain text."
(cl-labels ((file-contents ()
@@ -2872,7 +2872,7 @@ Compatibility wrapper for the function `info-setup' and
`info-pop-to-buffer'."
(goto-char (button-get button 'go-to))))))))
(defun annotate-update-visited-buffer-maybe (filename)
- "Reload annotation mode in the buffer visiting `FILENAME', if such buffer
exists."
+ "Reload annotation mode in the buffer visiting FILENAME, if such buffer
exists."
(let ((visited-buffer (find-buffer-visiting filename)))
(when visited-buffer ;; a buffer is visiting the file
(with-current-buffer visited-buffer
@@ -2922,11 +2922,11 @@ pressed."
(annotate-show-annotation-summary query nil nil)))))
(cl-defun annotate-wrap-text (text &optional (wrapper "\""))
- "Wrap string `TEXT' with string `WRAPPER'."
+ "Wrap string TEXT with string WRAPPER."
(concat wrapper text wrapper))
(cl-defun annotate-unwrap-text (text &optional (wrapper "\"") (left-side t))
- "Remove `WRAPPER' at both ends from `TEXT'."
+ "Remove WRAPPER at both ends from TEXT."
(let ((results text)
(wrapper-length (length wrapper)))
(when (>= (length text)
@@ -2947,7 +2947,7 @@ pressed."
(cl-defun annotate-show-annotation-summary (&optional arg-query
cut-above-point (save-annotations t))
"Show a summary of all the annotations in a temp buffer, the
results can be filtered with a simple query language: see
-`ANNOTATE-SUMMARY-FILTER-DB'."
+`annotate-summary-filter-db'."
(interactive)
(cl-labels ((ellipsize (text prefix-string)
(let* ((prefix-length (string-width prefix-string))
@@ -3121,7 +3121,7 @@ results can be filtered with a simple query language: see
summary window is shown.")
(defvar annotate-summary-query-current-token nil
- "Holds the next token of the query in `ANNOTATE-SUMMARY-QUERY'.")
+ "Holds the next token of the query in `annotate-summary-query'.")
(defun annotate-summary-query-lexer-symbol (res)
"The symbol identifying the token (e.g. \\='and)."
@@ -3151,7 +3151,7 @@ defined meaning according to our grammar.
For example this string:
-p.* and (a or not b)'
+p.* and (a or not b)
will be broken into these tokens:
@@ -3175,9 +3175,9 @@ The format is a proper list where:
- third and fourth element (currently unused)
the substring limits for this token (as returned by
- `match-beginning' and `match-end'.
+ MATCH-BEGINNING and MATCH-END.
-Note that spaces are ignored and all the tokens except `re' must
+Note that spaces are ignored and all the tokens except \"re\" must
not be prefixed with a backslash to match. So, for example not ->
will match the token type \\='not but \not will match the token \\='re;
this way we can \"protect\" a regexp that contains reserved
@@ -3186,7 +3186,7 @@ keyword (aka escaping).
The special value :no-more-token is returned after the whole
input is processed.
-Calling this function with value of LOOK-AHEAD-P nil will `CONSUME' the
+Calling this function with value of LOOK-AHEAD-P nil will consume the
token from `annotate-summary-query' (i.e. that string is modified).
example:
@@ -3240,12 +3240,12 @@ example:
res)))))
(defun annotate-summary-query-parse-end-input-p (token)
- "Non nil if there are no more tokens in `ANNOTATE-SUMMARY-QUERY'."
+ "Non nil if there are no more tokens in `annotate-summary-query'."
(eq token :no-more-tokens))
(defun annotate-summary-token-symbol-match (looking-symbol token)
- "Return non nil if `LOOKING-SYMBOL' is \"eq\" to the symbol
-component of `TOKEN'."
+ "Return non nil if LOOKING-SYMBOL is \"eq\" to the symbol
+component of TOKEN."
(eq looking-symbol
(annotate-summary-query-lexer-symbol token)))
@@ -3276,8 +3276,8 @@ Arguments:
- filter-fn is a function that accept two parameters: the regular
expression to match (a token of type \\='re, see the lexer
- `ANNOTATE-SUMMARY-LEXER' and a single annotation record (see
- `ANNOTATE-LOAD-ANNOTATIONS').
+ `annotate-summary-lexer' and a single annotation record (see
+ `annotate-load-annotations`).
This function will reject (its value is nil) records that do
not match the annotation.
@@ -3403,7 +3403,7 @@ Arguments:
(operator filter-fn annotation matchp)))))
;; if we are here the lexer can not find any more tokens in the query
;; just return the value of res
- res)))) ; end of `(if (not (annotate-summary-query-parse-end-input-p
look-ahead))'
+ res)))) ; end of '(if (not (annotate-summary-query-parse-end-input-p
look-ahead))'
(defun annotate-summary-query-parse-expression ()
"Parse rule for expression:
@@ -3434,7 +3434,7 @@ NOT := \"not\"
DELIMITER := \" ; ASCII 34 (dec) 22 (hex)
Note: this function returns the annotation part of the record, see
-`ANNOTATE-LOAD-ANNOTATIONS'."
+`annotate-load-annotations'."
(lambda (annotation query file-filter-fn note-filter-fn)
(let ((annotate-summary-query query) ; save the query
(query-notes-only nil)) ; the query for just the notes
@@ -3525,7 +3525,7 @@ Note: this function returns the annotation part of the
record, see
(defun annotate-summary-filter-db (annotations-dump query
remove-annotations-cutoff-point)
"Filter an annotation database with a query.
-The argument `QUERY' is a string that respect a simple syntax:
+The argument QUERY is a string that respect a simple syntax:
- [file-mask] [(and | or) [not] regex-note [(and | or) [not] regexp-note ...]]
@@ -3632,11 +3632,11 @@ annotate minor mode active."
refresh all the annotations contained in each buffer where
annotate minor mode is active.
-if `DATABASE-FILE-PATH' is nil (the default) a prompt asking for
+if DATABASE-FILE-PATH is nil (the default) a prompt asking for
a file containing database is presented to the user, otherwise
the value of this argument is used.
-If `FORCE-LOAD' is non nil no prompt asking user for confirmation
+If FORCE-LOAD is non nil no prompt asking user for confirmation
about loading the new file is shown.
Note: this function will attempt to load (compile and
@@ -3667,9 +3667,9 @@ code, always use load files from trusted sources!"
;;; merging database
(defun annotate--merge-interval (a b)
- "Merge two annotation interval `A' and `B'.
+ "Merge two annotation interval A and B.
-The new interval is expanded so that includes `A' and `B'."
+The new interval is expanded so that includes A and B."
(let ((new-left-limit (min (annotate--interval-left-limit a)
(annotate--interval-left-limit b)))
(new-right-limit (max (annotate--interval-right-limit a)
@@ -3678,7 +3678,7 @@ The new interval is expanded so that includes `A' and
`B'."
new-right-limit)))
(defun annotate--db-annotations-overlaps-p (annotation-a annotation-b)
- "Return non nil if `ANNOTATION-A' and `ANNOTATION-B' overlaps."
+ "Return non nil if ANNOTATION-A and ANNOTATION-B overlaps."
(let ((interval-a (annotate-annotation-interval annotation-a))
(interval-b (annotate-annotation-interval annotation-b)))
(not (or (< (annotate--interval-right-limit interval-b)
@@ -3703,8 +3703,8 @@ Uses `annotate--merge-interval'."
(annotate-make-annotation left right new-annotation-text
new-annotated-text))))
(defun annotate--db-remove-overlap-annotations (annotations &optional accum)
- "Recursively merges overlapping annotations in `ANNOTATIONS'
-using `ANNOTATE--DB-MERGE-ANNOTATIONS'."
+ "Recursively merges overlapping annotations in ANNOTATIONS
+using `annotate--db-merge-annotations'."
(if (= (length annotations) 1)
(push (cl-first annotations) accum)
(let* ((probe (cl-first annotations))
@@ -3725,7 +3725,7 @@ using `ANNOTATE--DB-MERGE-ANNOTATIONS'."
(annotate--db-remove-overlap-annotations rest-annotations (push probe
accum))))))
(defun annotate--db-merge-databases (db-1 db-2 &optional accum)
- "Recursively merge database `DB-1' and `DB-2'."
+ "Recursively merge database DB-1 and DB-2."
(cl-labels ((find-same-file-record (record annotations-db)
(let ((record-filename (annotate-filename-from-dump record)))
(cl-find-if (lambda (a)
