fixed bug in fume-match-find-next-function-name

2 files changed, 7 insertions, 6 deletions

diff --git a/generic/proof.el b/generic/proof.el
index ca543de8..7fe152e5 100644
--- a/generic/proof.el
+++ b/generic/proof.el
@@ -958,14 +958,17 @@ buffer is closed off atomically."
 (and (fboundp 'fume-match-find-next-function-name)
 (defun fume-match-find-next-function-name (buffer)
   "General next function name in BUFFER finder using match.
-  The regexp is assumed to be a two item list the car of which is the regexp
-  to use, and the cdr of which is the match position of the function name"
-  (save-excursion
+The regexp is assumed to be a two item list the car of which is the regexp
+to use, and the cdr of which is the match position of the function
+name. Moves point after the match."
+  ;; DO NOT USE save-excursion; we need to move point!
+  ;; save-excursion is called at a higher level in the func-menu
+  ;; package 
     (set-buffer buffer)
     (let ((r (car fume-function-name-regexp))
 	  (p (cdr fume-function-name-regexp)))
       (and (re-search-forward r nil t)
-	   (cons (buffer-substring (setq p (match-beginning p)) (point)) p))))))
+	   (cons (buffer-substring (setq p (match-beginning p)) (point)) p)))))
 
 
 ;;; end messy COMPATIBILITY HACKING
diff --git a/todo b/todo
index 868f79a7..18899a30 100644
--- a/todo
+++ b/todo
@@ -14,8 +14,6 @@ X (Low)    probably not worth wasting time on
 * This is a list of things which need doing in the generic interface
 ====================================================================
 
-A* There is something seriously broken with fume-func. (1h)
-
 A* Fixup multiple files -- needs debugging.
 
    1. mark atomic makes some assumption about non-comment commands in