--- a/lisp/hyperbole/hyperbole.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/hyperbole/hyperbole.el	Mon Aug 13 09:02:59 2007 +0200
@@ -8,15 +8,15 @@
 ;; KEYWORDS:     hypermedia
 ;;
 ;; AUTHOR:       Bob Weiner
-;; ORG:          InfoDock Associates
+;; ORG:          Motorola, Inc., PWDG
 ;;
 ;; ORIG-DATE:     6-Oct-92 at 11:52:51
-;; LAST-MOD:     15-Mar-97 at 17:09:40 by Bob Weiner
+;; LAST-MOD:      3-Nov-95 at 23:14:52 by Bob Weiner
 ;;
 ;; This file is part of Hyperbole.
 ;; Available for use and distribution under the same terms as GNU Emacs.
 ;;
-;; Copyright (C) 1992-1996, Free Software Foundation, Inc.
+;; Copyright (C) 1992-1995, Free Software Foundation, Inc.
 ;; Developed with support from Motorola Inc.
 ;;
 ;; DESCRIPTION:  
@@ -118,7 +118,7 @@
 
 ;;; Provides a site standard way to easily switch between the Hyperbole mouse
 ;;; bindings and a set of personal mouse bindings.  You may instead show
-;;; users how to bind this to a key via `hyperb:init-hook' (see
+;;; users how to bind this to a key via 'hyperb:init-hook' (see
 ;;; Hyperbole Manual).
 ;;;
 (or (global-key-binding "\C-ct")
@@ -130,7 +130,7 @@
   (interactive "P")
   (if arg (assist-key) (action-key)))
 
-;;; A value of t for `hkey-init' below will cause the Hyperbole
+;;; A value of t for 'hkey-init' below will cause the Hyperbole
 ;;; context-sensitive keys to be bound to keyboard keys, in addition to any
 ;;; mouse key bindings.  Comment it out or set it to nil if you don't want
 ;;; these bindings.  Or change the bindings in the succeeding lines.
@@ -314,16 +314,15 @@
 ;;; Hyperbole system.
 
 ;; Action type definitions.
-(autoload 'defact            "hsite"
+(autoload 'defact           "hsite"
   "Creates an action TYPE (an unquoted symbol) with PARAMS, described by DOC."
   nil 'macro)
 ;; Implicit button type definitions.
-(autoload 'defib             "hsite"
+(autoload 'defib            "hsite"
   "Creates implicit button TYPE (unquoted sym) with PARAMS, described by DOC."
   nil 'macro)
 
 (autoload 'ebut:map          "hsite"      "Map over Hyperbole buffer buttons." nil)
-(autoload 'hbut:key-src      "hsite"      "Called by {e} command in rolo match buffer.")
 (autoload 'hui:ebut-rename   "hsite"      "Rename a Hyperbole button."     t)
 (autoload 'hyperbole         "hsite"      "Hyperbole info manager menus."  t)
 
@@ -355,15 +354,12 @@
 	  "Make PATH absolute from optional DEFAULT-DIRS." nil)
 (autoload 'hpath:find        "hsite"
 	  "Edit file FILENAME, possibly using a special command." t)
-(autoload 'hpath:find-other-frame "hsite"
-	  "Edit file FILENAME in other frame, possibly using a special command." t)
 (autoload 'hpath:find-other-window "hsite"
 	  "Edit file FILENAME in other window, possibly using a special command." t)
 
 ;;; Hyperbole entry points that trigger loading part of the system.
 
 (autoload 'hypb:functionp    "hypb"       "Return t iff OBJ is a function." nil)
-(autoload 'hypb:display-file-with-logo "hypb" "Display FILE with IDA logo." nil)
 
 ;;; Hyperbole msg reader autoloads.
 (autoload 'Rmail-init "hrmail" "Initializes Hyperbole Rmail support." t)
@@ -407,17 +403,16 @@
   )
 
 ;;; Hyperbole rolodex main entry points.
-(autoload 'rolo-add               "wrolo"      "Add an entry to rolodex"       t)
-(autoload 'rolo-display-matches   "wrolo"      "Redisplay previous rolodex matches" t)
-(autoload 'rolo-edit              "wrolo"      "Edit an existing rolodex entry" t)
-(autoload 'rolo-fgrep             "wrolo"      "Rolodex string search"         t)
-(autoload 'rolo-grep              "wrolo"      "Rolodex regexp search"         t)
-(autoload 'rolo-kill              "wrolo"      "Delete an existing rolodex entry" t)
-(autoload 'rolo-logic             "wrolo-logic" "Logical rolodex search filters." t)
-(autoload 'rolo-sort              "wrolo"      "Sort rolodex entries" t)
-(autoload 'rolo-toggle-datestamps "wrolo"      "Toggle datestamp insertion." t)
-(autoload 'rolo-word              "wrolo"      "Rolodex string search for a word" t)
-(autoload 'rolo-yank              "wrolo"      "Insert a rolodex entry into current buffer" t)
+(autoload 'rolo-add              "wrolo"      "Add an entry to rolodex"       t)
+(autoload 'rolo-display-matches  "wrolo"      "Redisplay previous rolodex matches" t)
+(autoload 'rolo-edit             "wrolo"      "Edit an existing rolodex entry" t)
+(autoload 'rolo-fgrep            "wrolo"      "Rolodex string search"         t)
+(autoload 'rolo-grep             "wrolo"      "Rolodex regexp search"         t)
+(autoload 'rolo-kill             "wrolo"      "Delete an existing rolodex entry" t)
+(autoload 'rolo-logic            "wrolo-logic" "Logical rolodex search filters." t)
+(autoload 'rolo-sort             "wrolo"      "Sort rolodex entries" t)
+(autoload 'rolo-word             "wrolo"      "Rolodex string search for a word" t)
+(autoload 'rolo-yank             "wrolo"      "Insert a rolodex entry into current buffer" t)
 
 ;;; Hyperbole Key autoloads.
 (autoload 'Info-handle-in-note "hmous-info"
@@ -431,10 +426,11 @@
 (autoload 'smart-lisp-mode-p "hmouse-tag"
 	  "Jumps to Lisp identifier definitions.")
 (autoload 'smart-c++ "hmouse-tag" "Jumps to C++ identifier definitions.")
-(autoload 'smart-fortran-at-tag-p "hmouse-tag" "Jumps to Fortran identifier definitions.")
-(autoload 'smart-java "hmouse-tag" "Jumps to Java identifier definitions.")
-(autoload 'smart-java-at-tag-p "hmouse-tag" "Jumps to Java identifier definitions.")
+;; Does nothing unless OO-Browser C++ support has been loaded.
+(autoload 'smart-c++-oobr "hmouse-tag" "Jumps to C++ identifier definitions.")
 (autoload 'smart-objc "hmouse-tag" "Jumps to Objective-C identifier definitions.")
+;; Does nothing unless OO-Browser Objective-C support has been loaded.
+(autoload 'smart-objc-oobr "hmouse-tag" "Jumps to Objective-C identifier definitions.")
 (autoload 'smart-tags-file "hmouse-tag" "Determines nearest etags file.")
 (autoload 'smart-tags-file-path "hmouse-tag" "Expands a filename from TAGS file.")
 
@@ -486,14 +482,14 @@
 ;;;
 ;;; Hyperbole mail composer support configuration.
 ;;;
-(var:append 'mail-mode-hook      (list (function (lambda () (require 'hsmail)))))
-(var:append 'mh-letter-mode-hook (list (function (lambda () (require 'hsmail)))))
-(var:append 'vm-mail-mode-hook   (list (function (lambda () (require 'hsmail)))))
+(var:append 'mail-mode-hook      '((lambda () (require 'hsmail))))
+(var:append 'mh-letter-mode-hook '((lambda () (require 'hsmail))))
+(var:append 'vm-mail-mode-hook   '((lambda () (require 'hsmail))))
 
 ;;; ************************************************************************
 ;;; Frame function aliases.
 ;;; ************************************************************************
-;; Create all needed `frame-' aliases for all `screen-' functions, e.g.
+;; Create all needed 'frame-' aliases for all 'screen-' functions, e.g.
 ;; screen-width.
 (if (fboundp 'selected-frame)
     nil
@@ -505,8 +501,4 @@
 			 (intern-soft (concat "screen" func-name))))))
    '("-width" "-height")))
 
-;;; ************************************************************************
-;;; Register Hyperbole Package
-;;; ************************************************************************
-
 (provide 'hyperbole)