(texinfo-insert-menu): specify previously free variable `level' in a

`let' statement, as done elsewhere.

(texinfo-sequentially-find-pointer): replace unneeded free variable
`beginning' with (point-min) expression.

diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index f97c2b4bdbfe0e3025c3d51a79d13d6975d5cdba..43a6f0d0ac0f88020b9fbce99de70ebb098d21c0 100644 (file)
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -699,9 +699,9 @@ is the menu entry name, and the cdr of P is the node name."
 
     (insert "\n")) ; end this menu entry
   (insert "@end menu")
-  (message
-   ;; FIXME: `level' is passed by dynamic scoping.
-   "Updated \"%s\" level menu following node: %s ... " level node-name))
+  (let ((level (texinfo-hierarchic-level)))
+    (message
+     "Updated level \"%s\" menu following node: %s ... " level node-name)))
 
 \f
 ;;; Starting menu descriptions by inserting titles
@@ -1557,6 +1557,21 @@ regardless of its hierarchical level."
        (texinfo-sequentially-insert-pointer level 'up)
        (texinfo-clean-up-node-line)))))
 
+(defun texinfo-sequentially-insert-pointer (level direction)
+  "Insert the `Next', `Previous' or `Up' node name at point.
+Move point forward.
+
+The first argument is the hierarchical level of the Texinfo file, a
+string such as \"section\".  The second argument is direction, one of
+`next', `previous', or `up'."
+
+  (end-of-line)
+  (insert
+   ", "
+   (save-excursion
+     (texinfo-pointer-name
+      (texinfo-sequentially-find-pointer level direction)))))
+
 (defun texinfo-sequentially-find-pointer (level direction)
   "Find next or previous pointer sequentially in Texinfo file, or up pointer.
 Move point to section associated with the pointer.  Find point even if
@@ -1589,29 +1604,13 @@ or `Up' pointer."
          ((eq direction 'up)
           (if (re-search-backward
                (eval (cdr (assoc level texinfo-update-menu-higher-regexps)))
-               ;; FIXME: passed many levels down via dynamic scoping!
-               beginning
+               (point-min)
                t)
               'normal
             'no-pointer))
          (t
           (error "texinfo-sequential-find-pointer: lack proper arguments")))))
 
-(defun texinfo-sequentially-insert-pointer (level direction)
-  "Insert the `Next', `Previous' or `Up' node name at point.
-Move point forward.
-
-The first argument is the hierarchical level of the Texinfo file, a
-string such as \"section\".  The second argument is direction, one of
-`next', `previous', or `up'."
-
-  (end-of-line)
-  (insert
-   ", "
-   (save-excursion
-     (texinfo-pointer-name
-      (texinfo-sequentially-find-pointer level direction)))))
-
 \f
 ;;; Inserting `@node' lines
 ;; The `texinfo-insert-node-lines' function inserts `@node' lines as needed