[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/annotate d3988a476b 3/3: Merge pull request #144 from cage
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/annotate d3988a476b 3/3: Merge pull request #144 from cage2/no-warning-if-no-annotations-save |
Date: |
Mon, 19 Dec 2022 13:58:33 -0500 (EST) |
branch: elpa/annotate
commit d3988a476b410e0135d7345390fc88224c51fc6d
Merge: 7c39ccf838 65c4728346
Author: cage2 <1257703+cage2@users.noreply.github.com>
Commit: GitHub <noreply@github.com>
Merge pull request #144 from cage2/no-warning-if-no-annotations-save
Prevented warning when saving a non annotated buffer
---
Changelog | 51 ++++++++++++++++++++++++++++++++++++---------------
NEWS.org | 11 +++++++++++
annotate.el | 6 +++---
3 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/Changelog b/Changelog
index 1e6cc591ee..4b2ba25ac6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,21 +1,42 @@
+2022-12-15 cage
+
+ * annotate.el:
+
+ - prevented printing of warning when saving a buffer that has no file
+ under the hood and no annotation.
+ `annotate-save-annotations' printed a warning if the buffer was not
+ based on a file's contents. But the warning was printed even if the
+ buffer contained no annotations at all.
+ this patch prints the warning about missing file only if the buffer
+ is annotated (i.e. contains at least an annotation).
+
+2022-11-30 cage
+
+ * Changelog,
+ * NEWS.org,
+ * annotate.el:
+
+ - increased version number;
+ - update NEWS.org and Changelog.
+
2022-11-23 cage
- * annotate.el:
+ * annotate.el:
- - restored annotation of info files.
- - renamed variable to respect a stylistic convention.
- - do not skip 'annotate--remove-annotation-property' for narrowed
- buffer.
- Previously the function above just skipped narrowed buffer,
- effectively preventing delete of annotation's text. This patch just
- prevents the function to try to move the cursor beyond the buffer
- limit that would leads to a crash.
- The test for narrowed buffer was added because command like:
- 'comment-dwim' narrows the buffer beyond the curtains, but my patch
- was too radical, this changes supposed to fix annotation of info
- files and does not interferes with 'comment-dwim'.
-
-2022-11-22 cage2
+ - restored annotation of info files.
+ - renamed variable to respect a stylistic convention.
+ - do not skip 'annotate--remove-annotation-property' for narrowed
+ buffer.
+ Previously the function above just skipped narrowed buffer,
+ effectively preventing delete of annotation's text. This patch just
+ prevent the function to try to move the cursor beyond the buffer
+ limit that would leads to a crash.
+ The test for narrowed buffer was added because command like:
+ 'comment-dwim' narrows the buffer beyond the curtains, but my patch
+ was too radical, this changes supposed to fix annotation of info
+ files and does not interferes with 'comment-dwim'.
+
+2022-11-22 cage
Merge pull request #140 from cage2/fix-tramp-crash
diff --git a/NEWS.org b/NEWS.org
index 4f30deeb20..ee07f45d55 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,14 @@
+- 2022-12-15 v1.8.4 cage ::
+
+ This versions prevented printing of a warning
+
+ `annotate-save-annotations' printed a warning if the buffer was not
+ based on a file's contents. But the warning was printed even if the
+ buffer contained no annotations at all.
+
+ This version prints the warning about missing file only if the
+ buffer is annotated (i.e. contains at least an annotation).
+
- 2022-11-30 v1.8.3 cage ::
This versions fixed a bug that prevented annotations of info files.
diff --git a/annotate.el b/annotate.el
index 324afd4f12..40132e336d 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.8.3
+;; Version: 1.8.4
;; This file is NOT part of GNU Emacs.
@@ -58,7 +58,7 @@
;;;###autoload
(defgroup annotate nil
"Annotate files without changing them."
- :version "1.8.3"
+ :version "1.8.4"
:group 'text)
(defvar annotate-mode-map
@@ -1601,7 +1601,7 @@ essentially what you get from:
(message "Annotations saved.")))
((annotate-indirect-buffer-current-p)
(annotate--dump-indirect-buffer file-annotations))
- (t
+ (file-annotations
(lwarn '(annotate-mode)
:warning
annotate-warn-buffer-has-no-valid-file