Fix cl-sort invocation

bible.el

@@ -246,72 +246,72 @@ See `bible--display-lemma-hebrew'."
   '(;; Old Testament
     ("Ge" . "Genesis") ("Gen" . "Genesis")
     ("Ex" . "Exodus") ("Exo" . "Exodus")
-    ("Le" . "Leviticus")
+    ("Le" . "Leviticus") ("Lev" . "Leviticus")
     ("Nu" . "Numbers") ("Num" . "Numbers")
     ("De" . "Deuteronomy") ("Deu" . "Deuteronomy")
     ("Js" . "Joshua") ("Jos" . "Joshua")
-    ("Jg" . "Judges")  ("Judg" . "Judges")
-    ("Ru" . "Ruth")
-    ("1 Samuel" . "I Samuel") ("I Sa" . "I Samuel") ("1 Sa" . "I Samuel") ("1Sam" . "I Samuel")
+    ("Jg" . "Judges") ("Jdg" . "Judges") ("Judg" . "Judges")
+    ("Ru" . "Ruth") ("Rut" . "Ruth")
+    ("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")
+    ("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")
     ("2 Chronicles" . "II Chronicles") ("II Ch" . "II Chronicles") ("2 Ch" . "II Chronicles")
     ("Ezr" . "Ezra")
-    ("Ne" . "Nehemiah")
-    ("Es" . "Esther")
-    ("Jb" . "Job")
-    ("Ps" . "Psalms") ("Psa" . "Psalms")
-    ("Pr" . "Proverbs")
-    ("Ec" . "Ecclesiastes")
-    ("So" . "Song of Solomon")
-    ("Is" . "Isaiah") ("Isa" . "Isaiah")
-    ("Je" . "Jeremiah") ("Jer" . "Jeremiah")
-    ("La" . "Lamentations")
-    ("Ez" . "Ezekiel")
-    ("Da" . "Daniel")
-    ("Ho" . "Hosea")
+    ("Ne"  . "Nehemiah") ("Neh"  . "Nehemiah")
+    ("Es"  . "Esther") ("Est"  . "Esther")
+    ("Jb"  . "Job")
+    ("Ps"  . "Psalms") ("Psa" . "Psalms")
+    ("Pr"  . "Proverbs") ("Pro" . "Proverbs") 
+    ("Ec"  . "Ecclesiastes") ("Ecc"  . "Ecclesiastes")
+    ("So"  . "Song of Solomon") ("Sol"  . "Song of Solomon")
+    ("Is"  . "Isaiah") ("Isa" . "Isaiah")
+    ("Je"  . "Jeremiah") ("Jer" . "Jeremiah")
+    ("La"  . "Lamentations") ("Lam"  . "Lamentations")
+    ("Ez"  . "Ezekiel") ("Eze"  . "Ezekiel")
+    ("Da"  . "Daniel") ("Dan" . "Daniel")
+    ("Ho"  . "Hosea") ("Hos"  . "Hosea")
     ("Joe" . "Joel")
-    ("Am" . "Amos")
-    ("Ob" . "Obadiah")
+    ("Am"  . "Amos") ("Amo"  . "Amos")
+    ("Ob"  . "Obadiah") ("Oba"  . "Obadiah")
     ("Jon" . "Jonah")
-    ("Mi" . "Micah")
-    ("Na" . "Nahum")
-    ("Ha" . "Habakkuk")
+    ("Mi"  . "Micah") ("Mic"  . "Micah")
+    ("Na"  . "Nahum") ("Nah"  . "Nahum")
+    ("Ha"  . "Habakkuk") ("Hab"  . "Habakkuk")
     ("Zep" . "Zephaniah")
     ("Hag" . "Haggai")
-    ("Ze"    . "Zechariah")
-    ("Mal"  . "Malachi")
+    ("Ze"  . "Zechariah") ("Zac"  . "Zechariah")
+    ("Mal" . "Malachi")
 
     ;; New Testament
     ;; Added AbbottSmith lexicon abbreviations to allow proper following of cross references in lexicon buffers.
     ("Mt" . "Matthew") ("Mat" . "Matthew") ("Matt" . "Matthew")
-    ("Mk" . "Mark")
-    ("Lk" . "Luke")
-    ("Jo" . "John")
+    ("Mk" . "Mark") ("Mar" . "Mark")
+    ("Lk" . "Luke") ("Luk" . "Luke")
+    ("Jo" . "John") ("Joh" . "John")
     ("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")
+    ("1 Corintihans" . "I Corinthians") ("I Co" . "I Corinthians") ("1 Co" . "I Corinthians") ("ICor" . "I Corinthians") ("1Cor" . "I Corinthians")
+    ("2 Corinthians" . "II Corinthians") ("II Co" . "II Corinthians") ("2 Co" . "II Corinthians") ("IICor" . "II Corinthians") ("2Cor" . "II Corinthians")
     ("Ga" . "Galatians") ("Gal" . "Galatians")
     ("Eph" . "Ephesians")
     ("Phl" . "Philippians") ("Phil" . "Philippians")
     ("Col" . "Colossians")
-    ("1 Thessalonians" . "I Thessalonians")  ("I Th" . "I Thessalonians") ("1 Th" . "I Thessalonians") ("IThess" . "I Thessalonians")
-    ("2 Thessalonians" . "II Thessalonians") ("II Th" . "II Thessalonians") ("2 Th" . "II Thessalonians") ("IIThess" . "II Thessalonians")
-    ("1 Timothy" . "I Timothy")   ("I Ti"  . "I Timothy")  ("1 Ti" . "I Timothy")  ("ITim" . "I Timothy")
-    ("2 Timothy" . "II Timothy")  ("II Ti" . "II Timothy") ("2 Ti" . "II Timothy") ("IITim" . "II Timothy")
+    ("1 Thessalonians" . "I Thessalonians")  ("I Th" . "I Thessalonians") ("1 Th" . "I Thessalonians") ("IThess" . "I Thessalonians") ("1Thes" . "I Thessalonians")
+    ("2 Thessalonians" . "II Thessalonians") ("II Th" . "II Thessalonians") ("2 Th" . "II Thessalonians") ("IIThess" . "II Thessalonians") ("2Thes" . "II Thessalonians")
+    ("1 Timothy" . "I Timothy")   ("I Ti"  . "I Timothy")  ("1 Ti" . "I Timothy")  ("ITim" . "I Timothy") ("1Tim" . "I Timothy")
+    ("2 Timothy" . "II Timothy")  ("II Ti" . "II Timothy") ("2 Ti" . "II Timothy") ("IITim" . "II Timothy") ("2Tim" . "II Timothy")
     ("Tit" . "Titus")
-    ("Phm" . "Philemon") ("Phlm" . "Philemon")
+    ("Phm" . "Philemon") ("Phlm" . "Philemon") ("Plm" . "Philemon")
     ("He" . "Hebrews") ("Heb" . "Hebrews")
-    ("Ja" . "James") ("Jas" . "James")
-    ("1 Peter" . "I Peter") ("I Pe" . "I Peter") ("1 Pe" . "I Peter")
-    ("2 Peter" . "II Peter")  ("II Pe" . "II Peter") ("2 Pe" . "II Peter") ("IIPet" . "II Peter")
-    ("1 John" . "I John") ("I Jo" . "I John") ("1 Jo" . "I John") ("IJohn" . "I John")
-    ("2 John" . "II John") ("II Jo"  . "II John") ("2 Jo" . "II John") ("IIJohn" . "II John")
-    ("3 John" . "III John") ("III Jo" . "III John") ("3 Jo" . "III John") ("IIIJohn" . "III John")
-    ("Ju" . "Jude")
+    ("Ja" . "James") ("Jas" . "James") ("Jam" . "James")
+    ("1 Peter" . "I Peter") ("I Pe" . "I Peter") ("1 Pe" . "I Peter") ("IPet" . "I Peter") ("1Pet" . "I Peter")
+    ("2 Peter" . "II Peter")  ("II Pe" . "II Peter") ("2 Pe" . "II Peter") ("IIPet" . "II Peter") ("2Pet" . "II Peter")
+    ("1 John" . "I John") ("I Jo" . "I John") ("1 Jo" . "I John") ("IJohn" . "I John") ("1Jn" . "I John")
+    ("2 John" . "II John") ("II Jo"  . "II John") ("2 Jo" . "II John") ("IIJohn" . "II John") ("2Jn" . "I John")
+    ("3 John" . "III John") ("III Jo" . "III John") ("3 Jo" . "III John") ("IIIJohn" . "III John") ("3Jn" . "I John")
+    ("Ju" . "Jude") ("Jde" . "Jude")
     ("Re" . "Revelation of John") ("Rev" . "Revelation of John"))
   "A-list of abbreviations for Bible books.")
 
@@ -628,7 +628,7 @@ specifies the module to use."
     (bible)
     (when module
       (setq-default bible-module module))
-    (setq-local bible-module (or module (default-value 'bible-module)))
+    (setq-local bible-module (default-value 'bible-module))
     (bible--set-location
      (assoc (or book-name "Genesis") bible--books)
      (or chapter 1)
@@ -781,7 +781,7 @@ Handle abbreviations from lexicon module (AbbottSmith)."
          book
          chapter
          verse)
-    (message "Trying to follow %s" xref)
+;;    (message "Trying to follow %s" xref)
     (cond ((= (length verse-ref) 2) ; Mat 5 or the like
            (setq book-abbrev (car verse-ref)
                  chapter-verse (split-string (cadr verse-ref) ":")))
@@ -1561,7 +1561,7 @@ If optional argument VERSE is supplied, set cursor at verse."
              "III " "3"
              matchstr))))
          verses)))
-    (setq verses (cl-sort verses :lessp #'string-version-lessp))
+    (setq verses (cl-sort verses #'string-version-lessp))
     (dolist (verse verses)
       (if query-verses
           (setq query-verses (concat query-verses ";" verse))
@@ -1578,7 +1578,7 @@ If optional argument VERSE is supplied, set cursor at verse."
         (replace-match ""))))
   (setq mode-name (concat "Bible Search (" module))
   (when bible-search-range
-    (setq mode-name (concat mode-name " [" bible-search-range "]")))
+    (setq mode-name (concat mode-name " <" bible-search-range ">")))
   (setq mode-name (concat mode-name ")")))