From b9d69d1a170ce50df506e24f68d0453d2652ca7f Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 20 May 1991 20:31:21 +0000
Subject: [PATCH] Fix bug in FIND-TAG-DEFAULT.  This change requires new
 primitive SCAN-FORWARD-PREFIX-CHARS, first installed in microcode 11.81.

---
 v7/src/edwin/tagutl.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/v7/src/edwin/tagutl.scm b/v7/src/edwin/tagutl.scm
index ddb1c7472..1622b0af0 100644
--- a/v7/src/edwin/tagutl.scm
+++ b/v7/src/edwin/tagutl.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/tagutl.scm,v 1.41 1991/05/15 01:12:06 cph Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/tagutl.scm,v 1.42 1991/05/20 20:31:21 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -120,22 +120,23 @@ See documentation of variable tags-file-name."
   unspecific)
 
 (define (find-tag-default)
-  (let ((point (current-point)))
-    (let ((end (group-end point)))
-      (let ((mark
-	     (re-search-backward
-	      "\\sw\\|\\s_"
-	      (or (re-match-forward "\\(\\sw\\|\\s_\\)*" point end)
-		  point)
-	      (group-start point))))
-	(and mark
-	     (let ((mark (mark1+ mark)))
-	       (let ((mark*
-		      (re-search-forward "\\(\\s'\\)*"
-					 (backward-sexp mark 1 'LIMIT)
-					 mark)))
-		 (and mark*
-		      (extract-string mark* mark)))))))))
+  (let ((end
+	 (let ((point (current-point)))
+	   (or (re-match-forward "\\(\\sw\\|\\s_\\)+"
+				 point
+				 (group-end point)
+				 false)
+	       (let ((mark
+		      (re-search-backward "\\sw\\|\\s_"
+					  point
+					  (group-start point)
+					  false)))
+		 (and mark
+		      (mark1+ mark)))))))
+    (and end
+	 (extract-string (forward-prefix-chars (backward-sexp end 1 'LIMIT)
+					       end)
+			 end))))
 
 (define (find-tag string buffer start find-file)
   (let ((end (group-end start)))
-- 
2.25.1