[elpa] scratch/hyperbole 967814d82e 13/15: (man-show): Fix miscompilation

[Stefan Monnier]

branch: scratch/hyperbole
commit 967814d82e2c6795fc11a5db5ab08306629dfc6c
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    (man-show): Fix miscompilation
    
    * hactypes.el (annot-bib): Avoid gratuitous `setq`.
    (man-show): Declare `Man-notify-method` to fix miscompilation.
    (rfc-toc): `select-buffer` doesn't exist.
---
 hactypes.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/hactypes.el b/hactypes.el
index a622feb99e..0b10d978a3 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -32,14 +32,14 @@
 ;;; Standard Hyperbole action types
 ;;; ************************************************************************
 
-(defact annot-bib (key)
+(defact annot-bib (key) ;; FIXME: Clean up namespace use!
   "Follow internal ref KEY within an annotated bibliography, delimiters=[]."
   (interactive "sReference key (no []): ")
-  (let ((key-regexp (concat "^[*]*[ \t]*\\[" (ebut:key-to-label key) "\\]"))
-       citation)
-    (if (save-excursion
-         (goto-char (point-max))
-         (setq citation (re-search-backward key-regexp nil t)))
+  (let* ((key-regexp (concat "^[*]*[ \t]*\\[" (ebut:key-to-label key) "\\]"))
+        (citation (save-excursion
+                    (goto-char (point-max))
+                    (re-search-backward key-regexp nil t))))
+    (if citation
        (progn (hpath:display-buffer (current-buffer))
               (goto-char citation)
               (beginning-of-line))
@@ -688,6 +688,7 @@ package to display search results."
 Uses `hpath:display-where' setting to control where the man page is displayed."
   (interactive "sManual topic: ")
   (require 'man)
+  (defvar Man-notify-method)
   (let ((Man-notify-method 'meek))
     (hpath:display-buffer (man topic))))
 
@@ -715,7 +716,7 @@ Optional SECTIONS-START limits toc entries to those after 
that point."
       (insert "Sections of " rfc-buf-name ":\n")
       (set-buffer-modified-p nil))
     (when opoint
-      (select-buffer buf-name)
+      (set-buffer buf-name)
       (goto-char opoint))))
 
 (defact text-toc (section)