[elpa] scratch/hyperbole ed4adaea08: (man-show): Fix miscompilation

[Stefan Monnier]

branch: scratch/hyperbole
commit ed4adaea0888e6678e4e1094645d303af8ca5a74
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.
---
 hactypes.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/hactypes.el b/hactypes.el
index 903de92b5d..685302513e 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)))
+       (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))
@@ -690,6 +690,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))))