--- a/lisp/hyperbole/hui.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/hyperbole/hui.el	Mon Aug 13 09:02:59 2007 +0200
@@ -6,15 +6,15 @@
 ;; KEYWORDS:     hypermedia
 ;;
 ;; AUTHOR:       Bob Weiner
-;; ORG:          InfoDock Associates
+;; ORG:          Brown U.
 ;;
 ;; ORIG-DATE:    19-Sep-91 at 21:42:03
-;; LAST-MOD:     10-Nov-96 at 01:51:13 by Bob Weiner
+;; LAST-MOD:     25-Aug-95 at 02:26:56 by Bob Weiner
 ;;
 ;; This file is part of Hyperbole.
 ;; Available for use and distribution under the same terms as GNU Emacs.
 ;;
-;; Copyright (C) 1991-1996, Free Software Foundation, Inc.
+;; Copyright (C) 1991-1995, Free Software Foundation, Inc.
 ;; Developed with support from Motorola Inc.
 ;;
 ;; DESCRIPTION:  
@@ -287,7 +287,7 @@
 			(find-file-noselect gbut:file) "gbut-modify")
 		       (hbut:label-to-key
 			(hargs:read-match "Global button to modify: "
-					  (mapcar 'list (gbut:label-list))
+					  (mapcar 'list (gbut:lbl-list))
 					  nil t nil 'ebut)))))
   (let ((lbl (hbut:key-to-label lbl-key))
 	(but-buf (find-file-noselect gbut:file))
@@ -342,16 +342,6 @@
 	(t (or but (setq but 'hbut:current))
 	   (hui:but-flash) (hyperb:act but))))
 
-(defun hui:hbut-current-act ()
-  "Activate Hyperbole button at point or signal an error if there is no such button."
-  (interactive)
-  (let ((but (hbut:at-p)))
-    (cond ((null but)
-	   (hypb:error "(hbut-act): No current button to activate."))
-	  ((not (hbut:is-p but))
-	   (hypb:error "(hbut-act): Button is invalid; it has no attributes."))
-	  (t (hui:but-flash) (hyperb:act but)))))
-
 (defun hui:hbut-help (&optional but)
   "Checks for and explains an optional button given by symbol, BUT.
 BUT defaults to the button whose label point is within."
@@ -766,7 +756,7 @@
 	      (names (htype:names htype-sym))
 	      (term (hargs:read-match
 		     (concat (capitalize tstr)
-			     " to describe (RET for all): ")
+			     " to describe (RTN for all): ")
 		     (mapcar 'list (cons "" names))
 		     nil t nil htype-sym))
 	      nm-list