[elpa] externals/calibre 855a9cb092 2/2: Fix series sorting

[ELPA Syncer]

branch: externals/calibre
commit 855a9cb092eecf1e5c17ea56c440a0200f95eb4c
Author: Kjartan Oli Agustsson <kjartanoli@disroot.org>
Commit: Kjartan Oli Agustsson <kjartanoli@disroot.org>

    Fix series sorting
    
    * calibre-book.el (calibre-book-sort-by-series): Fix sorting order.
    * calibre.el: Bump version number.
    * etc/NEWS: Mention fix to sorting.
---
 calibre-book.el | 12 ++++++------
 calibre.el      |  2 +-
 etc/NEWS        |  4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/calibre-book.el b/calibre-book.el
index 118c3506fb..bf4080bd88 100644
--- a/calibre-book.el
+++ b/calibre-book.el
@@ -88,12 +88,12 @@
       t
     (if (not (calibre-book-series b))
         nil
-      (cl-case (compare-strings (calibre-book-series a) nil nil
-                                  (calibre-book-series b) nil nil)
-          (-1 t)
-          ((eq t) (< (calibre-book-series-index a)
-                     (calibre-book-series-index b)))
-          (1 nil)))))
+      (let ((v (compare-strings (calibre-book-series a) nil nil
+                                (calibre-book-series b) nil nil)))
+        (if (numberp v)
+            (< v 0)
+          (< (calibre-book-series-index a)
+             (calibre-book-series-index b)))))))
 
 (provide 'calibre-book)
 ;;; calibre-book.el ends here
diff --git a/calibre.el b/calibre.el
index ca852f61eb..2dbf7d4f23 100644
--- a/calibre.el
+++ b/calibre.el
@@ -4,7 +4,7 @@
 
 ;; Author: Kjartan Oli Agustsson <kjartanoli@disroot.org>
 ;; Maintainer: Kjartan Oli Agustsson <kjartanoli@disroot.org>
-;; Version: 1.4.0
+;; Version: 1.4.1
 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.1"))
 ;; URL: https://git.disroot.org/kjartanoli/calibre.el
 
diff --git a/etc/NEWS b/etc/NEWS
index 4fd68f6f5d..e853a4be1f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5,6 +5,10 @@ See the end of the file for license conditions.
 
 This file is about changes in calibre.el, the Emacs client for
 Calibre.
+
+* Changes in calibre.el 1.4.1
+** Fix sorting by series
+Sorting by series did not sort series names correctly.
 
 
 * Changes in calibre.el 1.4.0