|
|
@@ -248,6 +248,9 @@ which are of the form
|
|
|
|
|
|
;;;; Keymaps
|
|
|
|
|
|
+;;;; N.B. Bible Mode menu items appear in reverse order of their
|
|
|
+;;;; definition below
|
|
|
+
|
|
|
(defconst bible-mode-map (make-sparse-keymap)
|
|
|
"Keymap for bible-mode.")
|
|
|
(define-key bible-mode-map [menu-bar bible-mode]
|
|
|
@@ -257,9 +260,8 @@ which are of the form
|
|
|
[menu-bar bible-mode toggle-debug]
|
|
|
'("Toggle debug-on-error" . toggle-debug-on-error))
|
|
|
|
|
|
-
|
|
|
(defun bible-mode-toggle-display-diatheke ()
|
|
|
- "Toggle XML display."
|
|
|
+ "Toggle diatheke args display."
|
|
|
(interactive)
|
|
|
(setq bible-mode-show-diatheke-exec (not bible-mode-show-diatheke-exec)))
|
|
|
|
|
|
@@ -282,50 +284,53 @@ which are of the form
|
|
|
[menu-bar bible-mode sep]
|
|
|
'(menu-item '"--"))
|
|
|
|
|
|
+;;;;; Misc
|
|
|
+(define-key bible-mode-map "m" 'bible-mode-select-module)
|
|
|
+(define-key bible-mode-map "w" 'bible-mode-toggle-word-study)
|
|
|
+(define-key bible-mode-map "l" 'bible-mode-toggle-red-letter)
|
|
|
|
|
|
-;;;;; Navigation
|
|
|
-(define-key bible-mode-map "n" 'bible-mode-next-chapter)
|
|
|
+(define-key bible-mode-map "x" 'bible-mode-split-display)
|
|
|
(define-key bible-mode-map
|
|
|
- [menu-bar bible-mode next-chapter]
|
|
|
- '("Next Chapter" . bible-mode-next-chapter))
|
|
|
-
|
|
|
+ [menu-bar bible-mode split-display]
|
|
|
+ '("Split Display" . bible-mode-split-display))
|
|
|
+
|
|
|
+;;;;; Search
|
|
|
+(define-key bible-mode-map "/" 'bible-search)
|
|
|
+(define-key bible-mode-map "s" 'bible-search)
|
|
|
+(define-key bible-mode-map
|
|
|
+ [menu-bar bible-mode search]
|
|
|
+ '("Search" . bible-search))
|
|
|
+
|
|
|
+(define-key bible-mode-map "r" 'bible-mode-set-search-range)
|
|
|
+(define-key bible-mode-map
|
|
|
+ [menu-bar bible-mode range]
|
|
|
+ '("Set Search Range" . bible-mode-set-search-range))
|
|
|
+
|
|
|
+;;;;; Navigation
|
|
|
(define-key bible-mode-map "p" 'bible-mode-previous-chapter)
|
|
|
(define-key bible-mode-map
|
|
|
[menu-bar bible-mode previous-chapter]
|
|
|
'("Previous Chapter" . bible-mode-previous-chapter))
|
|
|
|
|
|
+(define-key bible-mode-map "n" 'bible-mode-next-chapter)
|
|
|
+(define-key bible-mode-map
|
|
|
+ [menu-bar bible-mode next-chapter]
|
|
|
+ '("Next Chapter" . bible-mode-next-chapter))
|
|
|
+
|
|
|
(define-key bible-mode-map (kbd "TAB") 'bible-mode-next-word)
|
|
|
(define-key bible-mode-map (kbd "M-<tab>") 'bible-mode-previous-word)
|
|
|
|
|
|
;;;;; Direct jump
|
|
|
-(define-key bible-mode-map "b" 'bible-mode-select-book)
|
|
|
-(define-key bible-mode-map
|
|
|
- [menu-bar bible-mode select-book]
|
|
|
- '("Select Book" . bible-mode-select-book))
|
|
|
-
|
|
|
(define-key bible-mode-map "c" 'bible-mode-select-chapter)
|
|
|
(define-key bible-mode-map
|
|
|
[menu-bar bible-mode select-chapter]
|
|
|
'("Select Chapter" . bible-mode-select-chapter))
|
|
|
|
|
|
-;;;;; Search
|
|
|
-(define-key bible-mode-map "/" 'bible-search)
|
|
|
-(define-key bible-mode-map "s" 'bible-search)
|
|
|
+(define-key bible-mode-map "b" 'bible-mode-select-book)
|
|
|
(define-key bible-mode-map
|
|
|
- [menu-bar bible-mode search]
|
|
|
- '("Bible Search" . bible-search))
|
|
|
-
|
|
|
-;;;; Not yet
|
|
|
-(define-key bible-mode-map "r" 'bible-mode-set-search-range)
|
|
|
-;;;;; Misc
|
|
|
-(define-key bible-mode-map "m" 'bible-mode-select-module)
|
|
|
-(define-key bible-mode-map "w" 'bible-mode-toggle-word-study)
|
|
|
-(define-key bible-mode-map "l" 'bible-mode-toggle-red-letter)
|
|
|
+ [menu-bar bible-mode select-book]
|
|
|
+ '("Select Book" . bible-mode-select-book))
|
|
|
|
|
|
-(define-key bible-mode-map "x" 'bible-mode-split-display)
|
|
|
-(define-key bible-mode-map
|
|
|
- [menu-bar bible-mode split-display]
|
|
|
- '("Split Display" . bible-mode-split-display))
|
|
|
|
|
|
(define-key bible-mode-map
|
|
|
[menu-bar bible-mode sep]
|
|
|
@@ -705,7 +710,11 @@ OT/NT etc. If that module doesn't have that verse...???"
|
|
|
(if searchtype
|
|
|
(progn
|
|
|
(setq filter nil) ; search is not compatible with filters XXX
|
|
|
- (setq args (append args (list "-s" (pcase searchtype ("lucene" "lucene") ("phrase" "phrase") ("regex" "regex") ("multiword" "multiword")))))
|
|
|
+ (setq args (append args (list "-s" (pcase searchtype
|
|
|
+ ("lucene" "lucene")
|
|
|
+ ("phrase" "phrase")
|
|
|
+ ("regex" "regex")
|
|
|
+ ("multiword" "multiword")))))
|
|
|
(when bible-mode-search-range (setq args (append args (list "-r" bible-mode-search-range)))))
|
|
|
(progn
|
|
|
(if filter
|
