From 033ef632ec57f6deb03c1668007628ce35484656 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 13 May 2003 15:56:50 +0000
Subject: [PATCH] r4917: Auto commit for Debian build

---
 base-class.lisp  |  8 ++++----
 debian/changelog |  6 ++++++
 views.lisp       | 31 +++++++++++++++----------------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/base-class.lisp b/base-class.lisp
index 24c24a3..47085cc 100644
--- a/base-class.lisp
+++ b/base-class.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: base-class.lisp,v 1.4 2002/12/13 08:25:45 kevin Exp $
+;;;; $Id: base-class.lisp,v 1.5 2003/05/13 15:53:21 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -25,7 +25,7 @@
 (defmethod print-object ((obj hyperobject) (s stream))
   (print-unreadable-object (obj s :type t :identity t)
     (let ((view (get-category-view obj :compact-text)))
-      (apply #'format s (obj-data-fmtstr view)
-	     (multiple-value-list 
-	      (funcall (obj-data-value-func view) obj))))))
+
+      (multiple-value-call #'format s (obj-data-fmtstr view)
+			   (funcall (obj-data-value-func view) obj)))))
 
diff --git a/debian/changelog b/debian/changelog
index f0e3e1e..54a1007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-hyperobject (2.7.3-1) unstable; urgency=low
+
+  * Replace multiple-value-lists 
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 13 May 2003 09:52:59 -0600
+
 cl-hyperobject (2.7.2-1) unstable; urgency=low
 
   * Fix for cmucl's 18e mop
diff --git a/views.lisp b/views.lisp
index 25bed5c..1f01b7f 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.30 2003/05/06 22:16:33 kevin Exp $
+;;;; $Id: views.lisp,v 1.31 2003/05/13 15:56:50 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -408,9 +408,8 @@
     (indent-spaces indent strm))
   (let-when (fmtstr (list-start-fmtstr view))
 	    (let-if (value-func (list-start-value-func view))
-		    (apply #'format strm fmtstr
-			   (multiple-value-list (funcall value-func
-							 obj num-items)))
+		    (multiple-value-call #'format strm fmtstr
+					 (funcall value-func obj num-items))
 		    (write-string fmtstr strm))))
 
 (defun fmt-list-end (obj view strm indent num-items)
@@ -419,8 +418,8 @@
       (indent-spaces indent strm))
   (let-when (fmtstr (list-end-fmtstr view))
 	    (let-if (value-func (list-end-value-func view))
-		    (apply #'format strm fmtstr (multiple-value-list
-						 (funcall value-func obj)))
+		    (multiple-value-call #'format strm fmtstr
+					 (funcall value-func obj))
 		    (write-string fmtstr strm))))
 
 ;;; Object Start and Ends
@@ -430,8 +429,8 @@
     (indent-spaces indent strm))
   (let-when (fmtstr (obj-start-fmtstr view))
 	    (let-if (value-func (obj-start-value-func view))
-		    (apply #'format strm fmtstr (multiple-value-list
-						 (funcall value-func obj)))
+		    (multiple-value-call #'format strm fmtstr
+					 (funcall value-func obj))
 		    (write-string fmtstr strm))))
 
 (defun fmt-obj-end (obj view strm indent)
@@ -439,8 +438,8 @@
     (indent-spaces indent strm))
   (let-when (fmtstr (obj-end-fmtstr view))
 	    (let-if (value-func (obj-end-value-func view))
-		    (apply #'format strm fmtstr (multiple-value-list
-						 (funcall value-func obj)))
+		    (multiple-value-call #'format strm fmtstr 
+					 (funcall value-func obj))
 		    (write-string fmtstr strm))))
   
 ;;; Object Data 
@@ -475,8 +474,8 @@
 
 (defun fmt-obj-data-plain (obj view strm)
   (awhen (obj-data-value-func view)
-	 (apply #'format strm (obj-data-fmtstr view)
-		(multiple-value-list (funcall it obj)))))
+	 (multiple-value-call #'format strm (obj-data-fmtstr view)
+			      (funcall it obj))))
 
 (defun fmt-obj-data-with-link (obj view strm refvars)
   (let ((refvalues '()))
@@ -494,14 +493,14 @@
 (defun obj-data (obj view)
   "Returns the objects data as a string. Used by common-graphics outline function"
   (awhen (obj-data-value-func view)
-	 (apply #'format nil (funcall (obj-data-fmtstr view))
-		(multiple-value-list (funcall it obj)))))
+	 (multiple-value-call #'format nil (funcall (obj-data-fmtstr view))
+			      (funcall it obj))))
 
 (defun make-link-data-str (obj view)
   "Return fmt string for that contains ~a slots for hyperlink link start and end"
   (awhen (obj-data-value-func view)
-	 (apply #'format nil (obj-data-fmtstr view)
-		(multiple-value-list (funcall it obj)))))
+	 (multiple-value-call #'format nil (obj-data-fmtstr view)
+			      (funcall it obj))))
 
 ;;; Display method for objects
 
-- 
2.34.1