Merge branch 'master' of github.com:sp1ff/elfeed-score

ChangeLog

@@ -1,3 +1,52 @@
+2022-07-02  Michael Herstine  <sp1ff@pobox.com>
+
+	Merge branch 'master' of github.com:sp1ff/elfeed-score
+
+2022-07-02  Michael  <sp1ff@pobox.com>
+
+	Merge pull request #26 from danielfleischer/patch-1
+	Update README
+
+2022-07-02  Daniel Fleischer  <danflscr@gmail.com>
+
+	Update README
+	Having a working example with property lists, similar to #24.
+	I missed the README, sorry.
+
+2022-07-02  Michael Herstine  <sp1ff@pobox.com>
+
+	Housekeeping commit.
+	This commit does a few things:
+
+	    1. addresses issue #25 ("Typo(?) in the readme")
+	    2. commits a unit test for issue #22 that was carelessly left
+	       laying around after fixing it
+	    3. bumps the version after merging pr #24
+
+2022-07-02  Michael  <sp1ff@pobox.com>
+
+	Merge pull request #24 from danielf-amobee/patch-1
+	Update elfeed-score.texi
+
+2022-06-15  Daniel Fleischer  <93716777+danielf-amobee@users.noreply.github.com>
+
+	Update elfeed-score.texi
+	Having a working example with property lists.
+
+2022-05-28  Michael  <sp1ff@pobox.com>
+
+	Merge pull request #23 from PaulPorfiroff/patch-1
+	Fix misleading `elfeed-score-serde-score-mark` docstring
+
+2022-05-12  Paul Porfiroff  <PaulPorfiroff@gmail.com>
+
+	Fix misleading `elfeed-score-serde-score-mark` docstring
+	`<=` -> `<`
+
+	https://github.com/sp1ff/elfeed-score/blob/419de17d681d75789271b8457509fa3f942eab54/elfeed-score-scoring.el#L659-L661
+
+	https://github.com/sp1ff/elfeed-score/blob/419de17d681d75789271b8457509fa3f942eab54/doc/elfeed-score.texi#L991-L994
+
 2022-04-27  Michael Herstine  <michael@lithic>
 
 	Resolve issue #22.

NEWS

@@ -2,15 +2,20 @@ elfeed-score News -- history of user-visible changes -*- outline -*-
 
 * elfeed-score 1.2
 
+** changes in elfeed-score 1.2.4
+
+*** address issue #25 Typo(?) in the readme
+*** accept PR #24 Update elfeed-score.texi
+*** accept PR #26 Update README
 ** changes in elfeed-score 1.2.3
 
-*** address issue 22
+*** address issue #22
 
 'adjust-tags' rules just didn't work due to an embarassing omission on my part.
 ** changes in elfeed-score 1.2.2
 
 *** update copyright statements
-*** address issue 21
+*** address issue #21
 
 Change default keybindings for a few commands:
 
@@ -22,14 +27,14 @@ Change default keybindings for a few commands:
 No code changes-- just updating the tag when merging to `master` since I mistakenly tagged the alpha release `1.2.0`.
 ** changes in elfeed-score 1.2.0
 
-**** address issue 19
+**** address issue #19
 
 Add user-defined scoring functions.
 * elfeed-score 1.1
 
 ** Changes in elfeed-score 1.1.0
 
-**** address issue 18
+**** address issue #18
 
 Add a :comment field to all rule types.
 * elfeed-score 1.0
@@ -106,7 +111,7 @@ The stats will still be maintained, but will be written to a separate file ('elf
 *** Bugfixes
 
 **** Make `score' mandatory in `elfeed-score-set-score' not optional
-**** Address issue 10
+**** Address issue #10
 
 When setting scores "manually" via `elfeed-score-set-score' will "stick": subsequently scoring that entry through the new entry hook or as part of scoring an entire search will not overwrite the manuall-set score.
 
@@ -115,7 +120,7 @@ Since this is a new feature, I've put it behind a configuration option `elfeed-s
 
 *** Bugfixes
 
-**** Address issue 12
+**** Address issue #12
 
 'link' rules were not being read in correctly--fixed.
 ** Changes in elfeed-score 0.7.7
@@ -130,7 +135,7 @@ No user-visible changes in this build; strictly re-factoring.
 
 *** Bugfixes
 
-**** Address issue 12
+**** Address issue #12
 
 Announce the fact when making a backup copy of the score file. If there is an error on copy, say so & continue (i.e. don't error out).
 
@@ -279,7 +284,7 @@ Numerous spelling errors corrected thanks to `flyspell'.
 
 *** Bug Fixes
 
-***** Issue 2: `elfeed-score-write-score-file` will elide information when the list gets long enough
+***** issue #2: `elfeed-score-write-score-file` will elide information when the list gets long enough
 
 Fixed.
 ** Changes in elfeed-score 0.5.0
@@ -296,7 +301,7 @@ Adjust an entry's score up or down based on the Author.
 
 *** Bug Fixes
 
-**** Issue 2: (elfeed-score-enable) must have an argument now, unlike README suggests
+**** issue #2: (elfeed-score-enable) must have an argument now, unlike README suggests
 
 Fixed.
 ** Changes in elfeed-score 0.4.3

README.org

@@ -2,7 +2,7 @@
 #+DESCRIPTION: Gnus-style scoring for Elfeed
 #+AUTHOR: Michael Herstine
 #+EMAIL: sp1ff@pobox.com
-#+DATE: <2022-07-02 Sat 08:11>
+#+DATE: <2022-07-02 Sat 08:22>
 #+AUTODATE: t
 #+OPTIONS: toc:nil org-md-headline-style:setext *:t ^:nil
 #+STARTUP: overview
@@ -26,12 +26,12 @@ For instance, here's a subset of my scoring file at the moment:
     ;;; Elfeed score file                                     -*- lisp -*-
     (("title"
       (:text "OPEN THREAD" :value -1000 :type S)
-      (:text "raymond c\\(hen\\)?" :value 250 :type r) :tags (t .(@dev)))
+      (:text "raymond c\\(hen\\)?" :value 250 :type r :tags (t . @dev))
      ("content"
       (:text "type erasure" :value 500 :type s))
      ("title-or-content"
-      (:text "california" 150 100 :type s)
-      (:text "china" 150 100 :type w))
+      (:text "california" :title-value 150 :content-value 100 :type s)
+      (:text "china" :title-value 150 :content-value 100 :type w))
      ("feed"
       (:text "Essays in Idleness" :value 250 :type S :attr t)
       (:text "Irreal" :value 250 :type S :attr t)
@@ -124,9 +124,9 @@ When elfeed-score loads a score file that uses an archaic format (i.e. a format
 This should all be transparent to the user.
 * Status and Roadmap
 
-I've been using [[https://github.com/sp1ff/elfeed-score][elfeed-score]] day in & day out for my RSS reading for almost two years now. I wrote a post on how [[https://github.com/sp1ff/elfeed-score][elfeed-score]] works, along with the process of submitting code to MELPA, [[https://www.unwoundstack.com/blog/scoring-elfeed-entries.html][here]]. [[https://github.com/C-J-Cundy][Chris]] wrote a post on how he uses it to [[https://cundy.me/post/elfeed/][manage ArXiv RSS Feeds]]. [[https://kitchingroup.cheme.cmu.edu/][John Kitchin]] talks about [[https://github.com/skeeto/elfeed][Elfeed]] & [[https://github.com/sp1ff/elfeed-score][elfeed-score]] [[https://www.youtube.com/watch?v=rvWbUGx9U5E][here]].
+I've been using [[https://github.com/sp1ff/elfeed-score][elfeed-score]] day in & day out for my RSS reading for over two years now. I wrote a post on how [[https://github.com/sp1ff/elfeed-score][elfeed-score]] works, along with the process of submitting code to MELPA, [[https://www.unwoundstack.com/blog/scoring-elfeed-entries.html][here]]. [[https://github.com/C-J-Cundy][Chris]] wrote a post on how he uses it to [[https://cundy.me/post/elfeed/][manage ArXiv RSS Feeds]]. [[https://kitchingroup.cheme.cmu.edu/][John Kitchin]] talks about [[https://github.com/skeeto/elfeed][Elfeed]] & [[https://github.com/sp1ff/elfeed-score][elfeed-score]] [[https://www.youtube.com/watch?v=rvWbUGx9U5E][here]].
 
-The version numbers (0.X) over that time were chosen to suggest preliminary releases, but I'm now calling this 1.0. The 0.9 releases were hygenic: cleaning-up the test suite, improving validation on deserializing the score file, and removing obsolete functions & variables. Beginning with 1.0, I'll also comply with semver (e.g. breaking changes will be a major release, new features a minor, and bug fixes a patch).
+The version numbers (0.X) over most of that time were chosen to suggest preliminary releases, but I'm now calling this 1.0. The 0.9 releases were hygenic: cleaning-up the test suite, improving validation on deserializing the score file, and removing obsolete functions & variables. Beginning with 1.0, I'll also comply with semver (e.g. breaking changes will be a major release, new features a minor, and bug fixes a patch).
 
 Going forward, I'd like to use elfeed-score to explore some ideas I have about learning the user's habits automatically based on their actions in Elfeed (but without making them feel they're being stalked).
 

THANKS

@@ -2,6 +2,9 @@ Contributors:
 
   - Miciah Dashiel Butler Masters <mmasters@redhat.com>
   - Chris Cundy <http://cundy.me/>
+  - Francisco Claude <fclaude@recoded.ci>
+  - Paul Porfiroff
+  - Daniel Fleischer
 
 Thanks to Qingshui Zheng <https://github.com/qingshuizheng> for his suggestions on cleaning-up the default keybindings for "add rule" commands.
 

doc/elfeed-score.texi

@@ -1399,7 +1399,7 @@ If you'd like to hack on elfeed-score, I've started a
 always happy to discuss PRs.
 
 Finally, you can just reach out directly at @email{sp1ff@@pobox.com}, or
-in my public @url{https://lists.sr.ht/~sp1ff/public-inbox, inbox}.
+shoot a webmention to me at my @url{https://www.unwoundstack.com,web site}.
 
 @node Index
 @unnumbered Index

doc/version.texi

@@ -1,4 +1,4 @@
-@set UPDATED 2 February 2022
-@set UPDATED-MONTH February 2022
-@set EDITION 1.2.3
-@set VERSION 1.2.3
+@set UPDATED 2 July 2022
+@set UPDATED-MONTH July 2022
+@set EDITION 1.2.4
+@set VERSION 1.2.4