Parcourir la source

Change sort to cl-sort for backward compatibility. Add abbrevs.

Fred Gilham il y a 2 semaines
Parent
commit
1f1777bd89
1 fichiers modifiés avec 15 ajouts et 14 suppressions
  1. 15 14
      bible.el

+ 15 - 14
bible.el

@@ -82,6 +82,7 @@
 ;; places. But since it is required by DOM and SHR, might as well take
 ;; advantage of it. Maybe re-do some of the code below with CL-LIB
 ;; constructs? (FMG 10-Mar-2026)
+;; Use cl-sort for backward compatibility. 21-Mar-2026
 (require 'cl-lib)
 (require 'dom)
 (require 'shr)
@@ -244,15 +245,15 @@ See `bible--display-lemma-hebrew'."
 (defvar bible--book-name-abbreviations
   '(;; Old Testament
     ("Ge" . "Genesis") ("Gen" . "Genesis")
-    ("Ex" . "Exodus")
+    ("Ex" . "Exodus") ("Exo" . "Exodus")
     ("Le" . "Leviticus")
-    ("Nu" . "Numbers")
+    ("Nu" . "Numbers") ("Num" . "Numbers")
     ("De" . "Deuteronomy") ("Deu" . "Deuteronomy")
-    ("Js" . "Joshua")
+    ("Js" . "Joshua") ("Jos" . "Joshua")
     ("Jg" . "Judges")  ("Judg" . "Judges")
     ("Ru" . "Ruth")
-    ("1 Samuel" . "I Samuel") ("I Sa" . "I Samuel") ("1 Sa" . "I Samuel")
-    ("2 Samuel" . "II Samuel") ("II Sa" . "II Samuel") ("2 Sa" . "II Samuel")
+    ("1 Samuel" . "I Samuel") ("I Sa" . "I Samuel") ("1 Sa" . "I Samuel") ("1Sam" . "I Samuel")
+    ("2 Samuel" . "II Samuel") ("II Sa" . "II Samuel") ("2 Sa" . "II Samuel") ("2Sam" . "II Samuel")
     ("1 Kings" . "I Kings") ("I Ki" . "I Kings") ("1 Ki" . "I Kings")
     ("2 Kings" . "II Kings") ("II Ki" . "II Kings") ("2 Ki" . "II Kings")
     ("1 Chronicles" . "I Chronicles")  ("I Ch" . "I Chronicles")  ("1 Ch" . "I Chronicles")
@@ -261,12 +262,12 @@ See `bible--display-lemma-hebrew'."
     ("Ne" . "Nehemiah")
     ("Es" . "Esther")
     ("Jb" . "Job")
-    ("Ps" . "Psalms")
+    ("Ps" . "Psalms") ("Psa" . "Psalms")
     ("Pr" . "Proverbs")
     ("Ec" . "Ecclesiastes")
     ("So" . "Song of Solomon")
-    ("Is" . "Isaiah")
-    ("Je" . "Jeremiah")
+    ("Is" . "Isaiah") ("Isa" . "Isaiah")
+    ("Je" . "Jeremiah") ("Jer" . "Jeremiah")
     ("La" . "Lamentations")
     ("Ez" . "Ezekiel")
     ("Da" . "Daniel")
@@ -285,11 +286,11 @@ See `bible--display-lemma-hebrew'."
 
     ;; New Testament
     ;; Added AbbottSmith lexicon abbreviations to allow proper following of cross references in lexicon buffers.
-    ("Mt" . "Matthew") ("Matt" . "Matthew")
+    ("Mt" . "Matthew") ("Mat" . "Matthew") ("Matt" . "Matthew")
     ("Mk" . "Mark")
     ("Lk" . "Luke")
     ("Jo" . "John")
-    ("Ac" . "Acts")
+    ("Ac" . "Acts") ("Act" . "Acts")
     ("Ro" . "Romans") ("Rom" . "Romans")
     ("1 Corintihans" . "I Corinthians") ("I Co" . "I Corinthians") ("1 Co" . "I Corinthians") ("ICor" . "I Corinthians")
     ("2 Corinthians" . "II Corinthians") ("II Co" . "II Corinthians") ("2 Co" . "II Corinthians") ("IICor" . "II Corinthians")
@@ -1325,7 +1326,7 @@ In processing subnodes, each case will prepend a space if it needs it."
                   (let ((start (point)))
                     (insert " " word)
                     (let ((end (point)))
-		      (message "crossreferencing %s" (buffer-substring start end))
+;;		      (message "crossreferencing %s" (buffer-substring start end))
                       (put-text-property start end 'xref word)
                       (put-text-property start end 'keymap bible-term-mode-map)
                       (put-text-property start end 'help-echo (concat "Go to " word " (incomplete feature)"))
@@ -1449,8 +1450,8 @@ If optional argument VERSE is supplied, set cursor at verse."
 	  (pop commentaries) ; Remove `Lexicons / Dictionaries:' line
 			     ; from bible--commentaries.
 	  (throw 'done nil))))
-    (setq bible--texts (sort texts :key #'car :lessp #'compare-module-names))
-    (setq bible--commentaries (sort commentaries :key #'car :lessp #'compare-module-names)))
+    (setq bible--texts (cl-sort texts #'compare-module-names :key #'car))
+    (setq bible--commentaries (cl-sort commentaries #'compare-module-names :key #'car)))
   nil)
 
 
@@ -1560,7 +1561,7 @@ If optional argument VERSE is supplied, set cursor at verse."
              "III " "3"
              matchstr))))
          verses)))
-    (sort verses :in-place t :lessp #'string-version-lessp)
+    (setq verses (cl-sort verses :lessp #'string-version-lessp))
     (dolist (verse verses)
       (if query-verses
           (setq query-verses (concat query-verses ";" verse))