--- a/lisp/ChangeLog	Mon Oct 13 16:37:48 2003 +0000
+++ b/lisp/ChangeLog	Mon Oct 13 18:53:24 2003 +0000
@@ -1,3 +1,11 @@
+2003-10-11  Steve Youngs  <sryoungs@bigpond.net.au>
+
+	* package-ui.el (pui-display-keymap): Map `m' to
+	`pui-display-maintainer'. 
+	(pui-help-echo): Display both the installed upstream version
+	number and the available upstream version number.
+	(pui-display-maintainer): New.
+
 2003-10-10  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* wid-edit.el (widget-url-link-action): Fix typo.

--- a/lisp/package-ui.el	Mon Oct 13 16:37:48 2003 +0000
+++ b/lisp/package-ui.el	Mon Oct 13 18:53:24 2003 +0000
@@ -104,6 +104,7 @@
     (define-key m "q" 'pui-quit)
     (define-key m "g" 'pui-list-packages)
     (define-key m "i" 'pui-display-info)
+    (define-key m "m" 'pui-display-maintainer)
     (define-key m "?" 'describe-mode)
     (define-key m "v" 'pui-toggle-verbosity-redisplay)
     (define-key m "d" 'pui-toggle-package-delete-key)
@@ -462,13 +463,14 @@
   "Display additional package info in the modeline.
 EXTENT determines the package to display (the package information is
 attached to the extent as properties)."
-  (let (pkg-sym info inst-ver auth-ver date maintainer balloon req)
+  (let (pkg-sym info inst-ver inst-auth-ver auth-ver date maintainer balloon req)
     (if (or force-update (not (current-message))
 	    (string-match ".*: .*: " (current-message)))
 	(progn
 	  (setq pkg-sym (extent-property extent 'pui-package)
 		info (extent-property extent 'pui-info)
 		inst-ver (package-get-key pkg-sym :version)
+		inst-auth-ver (package-get-key pkg-sym :author-version)
 		auth-ver (package-get-info-prop info 'author-version)
 		date (package-get-info-prop info 'date)
 		maintainer (package-get-info-prop info 'maintainer)
@@ -480,20 +482,16 @@
 		(setq balloon (format "
 Package Information:  [For package: \"%s\"]
 ================
-Installed Version : %.2f
-Author Version : %s
+Installed Upstream Ver: %s  Available Upstream Ver: %s
 Maintainer : %s
 Released : %s
 Required Packages : %s\n\n"
-				      pkg-sym inst-ver auth-ver maintainer 
+				      pkg-sym inst-auth-ver auth-ver maintainer 
 				      date req))
 		(set-extent-property extent 'balloon-help balloon)))
-	  (if pui-list-verbose
-	      (format 
-	       "Inst V: %.2f Auth V: %s Maint: %s" 
-	       inst-ver auth-ver maintainer)
-	    (format "%.2f : %s : %s"
-		    inst-ver auth-ver maintainer))))))
+	  (format 
+	   "Installed upstream ver: %s  Available upstream ver: %s" 
+	   inst-auth-ver auth-ver)))))
 
 (defun pui-display-info (&optional no-error event)
   "Display additional package info in the modeline.
@@ -509,6 +507,23 @@
 	  (error 'invalid-operation
 		 "No package under cursor!"))))))
 
+(defun pui-display-maintainer (&optional no-error event)
+  "Display a package's maintainer in the minibuffer."
+  (interactive)
+  (let (extent pkg-sym info maintainer)
+    (save-excursion
+      (beginning-of-line)
+      (if (setq extent 	(extent-at (point) (current-buffer) 'pui))
+	  (progn
+	    (setq pkg-sym (extent-property extent 'pui-package)
+		  info (extent-property extent 'pui-info)
+		  maintainer (package-get-info-prop info 'maintainer))
+	    (message (format "Maintainer: %s" maintainer)))
+	(if no-error
+	    (clear-message nil)
+	  (error 'invalid-operation
+		 "No package under cursor!"))))))
+
 (defvar pui-menu
   '("Packages"
     ["Toggle install " pui-toggle-package-key :active (pui-current-package) :suffix (format "`%s'" (or (pui-current-package) "..."))]
@@ -550,7 +565,8 @@
   `\\[pui-toggle-package-delete-key]' to select/unselect the current package for removal.
   `\\[pui-add-required-packages]' to add any packages required by those selected.
   `\\[pui-install-selected-packages]' to install/delete selected packages.
-  `\\[pui-display-info]' to display additional information about the package in the modeline.
+  `\\[pui-display-info]' to display additional information about the package in the minibuffer.
+  `\\[pui-display-maintainer]' to display the package's maintainer in the minibuffer
   `\\[pui-list-packages]' to refresh the package list.
   `\\[pui-toggle-verbosity-redisplay]' to toggle between a verbose and non-verbose display.
   `\\[pui-quit]' to kill this buffer.