Просмотр исходного кода

Fix oversights with search window

Fred Gilham 4 недель назад
Родитель
Сommit
42bf61062c
1 измененных файлов с 9 добавлено и 11 удалено
  1. 9 11
      bible.el

+ 9 - 11
bible.el

@@ -448,7 +448,7 @@ See `bible--display-lemma-hebrew'."
   "Toggle XML display."
   "Toggle XML display."
   (interactive)
   (interactive)
   (setq-local bible-debugme (not bible-debugme))
   (setq-local bible-debugme (not bible-debugme))
-  (bible--display))
+  (bible--display bible-module))
 
 
 (defvar-local bible-text-direction 'left-to-right)
 (defvar-local bible-text-direction 'left-to-right)
 
 
@@ -648,7 +648,7 @@ specifies the module to use."
     (setq-local bible--current-book book-data)
     (setq-local bible--current-book book-data)
     (setq-local bible--current-book-name (car book-data))
     (setq-local bible--current-book-name (car book-data))
     (setq-local bible--current-chapter chapter)
     (setq-local bible--current-chapter chapter)
-    (bible--display)))
+    (bible--display bible-module)))
 
 
 (defun bible-select-chapter ()
 (defun bible-select-chapter ()
   "Ask user for a new chapter for the current `bible' buffer."
   "Ask user for a new chapter for the current `bible' buffer."
@@ -678,13 +678,13 @@ specifies the module to use."
   "Toggle the inclusion of word study for the active `bible' buffer."
   "Toggle the inclusion of word study for the active `bible' buffer."
   (interactive)
   (interactive)
   (setq bible-word-study-enabled (not bible-word-study-enabled))
   (setq bible-word-study-enabled (not bible-word-study-enabled))
-  (bible--display))
+  (bible--display bible-module))
 
 
 (defun bible-toggle-red-letter ()
 (defun bible-toggle-red-letter ()
   "Toggle red letter mode for the active `bible' buffer."
   "Toggle red letter mode for the active `bible' buffer."
   (interactive)
   (interactive)
   (setq bible-red-letter-enabled (not bible-red-letter-enabled))
   (setq bible-red-letter-enabled (not bible-red-letter-enabled))
-    (bible--display))
+    (bible--display bible-module))
 
 
 (defun bible-split-display ()
 (defun bible-split-display ()
   "Copy the active `bible' buffer into a new buffer in another window."
   "Copy the active `bible' buffer into a new buffer in another window."
@@ -1100,7 +1100,6 @@ both tags, otherwise just get lex definition."
 
 
 (defun bible-handle-divine-name (item)
 (defun bible-handle-divine-name (item)
   "When ITEM is divine name, display it as such."
   "When ITEM is divine name, display it as such."
-  (message "Divine name %s" item)
   (insert "LORD")
   (insert "LORD")
   (let* ((refstart (- (point) (length "LORD")))
   (let* ((refstart (- (point) (length "LORD")))
          (refend (point))
          (refend (point))
@@ -1278,11 +1277,10 @@ In processing subnodes, each case will prepend a space if it needs it."
                     (add-face-text-property (- (point) (length word)) (point) '(:foreground "gray50")))))))))))
                     (add-face-text-property (- (point) (length word)) (point) '(:foreground "gray50")))))))))))
 
 
 
 
-(defun bible--display (&optional module verse)
-  "Render a page of text for `bible'.
-If optional argument MODULE is supplied, use that module for display.
+(defun bible--display (module &optional verse)
+  "Render a page of the text using MODULE as the source of the text.
 If optional argument VERSE is supplied, set cursor at verse."
 If optional argument VERSE is supplied, set cursor at verse."
-  (setq-local bible-module (or module (default-value 'bible-module)))
+  (setq-local bible-module module)
   (let ((buffer-read-only nil)
   (let ((buffer-read-only nil)
         (bible-chapter-title nil)
         (bible-chapter-title nil)
         (bible-has-lexemes nil)
         (bible-has-lexemes nil)
@@ -1307,7 +1305,7 @@ If optional argument VERSE is supplied, set cursor at verse."
             (add-face-text-property (match-beginning 0) (match-end 0) '(:foreground "purple"))))))
             (add-face-text-property (match-beginning 0) (match-end 0) '(:foreground "purple"))))))
     (save-excursion
     (save-excursion
       ;; Remove the module name from the buffer.
       ;; Remove the module name from the buffer.
-      (while (re-search-forward (concat "^.*" bible-module ".*$") nil t)
+      (while (re-search-forward (concat "^.*" module ".*$") nil t)
         (replace-match "" nil t)))
         (replace-match "" nil t)))
     (save-excursion
     (save-excursion
       ;; Fix divine name lossage.
       ;; Fix divine name lossage.
@@ -1457,7 +1455,7 @@ If optional argument VERSE is supplied, set cursor at verse."
           (setq query-verses (concat query-verses ";" verse))
           (setq query-verses (concat query-verses ";" verse))
         (setq query-verses verse)))
         (setq query-verses verse)))
     (let ((bible-show-diatheke-exec nil))
     (let ((bible-show-diatheke-exec nil))
-      (bible--exec-diatheke query-verses nil nil module))
+      (insert (bible--exec-diatheke query-verses nil nil module)))
     (let* ((html-dom-tree (libxml-parse-html-region (point-min) (point-max))))
     (let* ((html-dom-tree (libxml-parse-html-region (point-min) (point-max))))
       (erase-buffer)
       (erase-buffer)
       (bible--insert-domnode-recursive (dom-by-tag html-dom-tree 'body) nil nil))
       (bible--insert-domnode-recursive (dom-by-tag html-dom-tree 'body) nil nil))