From 3dcf665222a5049d4d3d9bd463dbed705efa31d5 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 16 Apr 2003 18:37:47 +0000
Subject: [PATCH] r4511: Automatic commit for debian_version_2_6_3-1

---
 debian/changelog |  6 ++++++
 views.lisp       | 34 +++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac4dc74..548681a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-hyperobject (2.6.3-1) unstable; urgency=low
+
+  * Fix :type in object-view class
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 16 Apr 2003 12:37:33 -0600
+
 cl-hyperobject (2.6.2-1) unstable; urgency=low
 
   * Handle both named/unnamed implementations of
diff --git a/views.lisp b/views.lisp
index 8f0f9b8..de238b4 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.25 2003/03/26 21:03:22 kevin Exp $
+;;;; $Id: views.lisp,v 1.26 2003/04/16 18:37:47 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -37,57 +37,57 @@
    (country-language :initform :en :initarg :country-language
 		     :documentation "Country's Language for this view.")
    ;;
-   (file-start-str :type string :initform nil :initarg :file-start-str
+   (file-start-str :type (or string null) :initform nil :initarg :file-start-str
 		   :accessor file-start-str)
-   (file-end-str :type string :initform nil :initarg :file-end-str
+   (file-end-str :type (or string null) :initform nil :initarg :file-end-str
 		 :accessor file-end-str)
-   (list-start-fmtstr :type string :initform nil :initarg :list-start-fmtstr
+   (list-start-fmtstr :type (or string null) :initform nil :initarg :list-start-fmtstr
 		      :accessor list-start-fmtstr)
-   (list-start-value-func :type function :initform nil
+   (list-start-value-func :type (or function null) :initform nil
 			  :initarg :list-start-value-func
 			  :accessor list-start-value-func)
    (list-start-indent :initform nil :initarg :list-start-indent
 		      :accessor list-start-indent)
-   (list-end-fmtstr :type string :initform nil :initarg :list-end-fmtstr
+   (list-end-fmtstr :type (or string null) :initform nil :initarg :list-end-fmtstr
 		    :accessor list-end-fmtstr)
-   (list-end-value-func :type function :initform nil
+   (list-end-value-func :type (or function null) :initform nil
 			:initarg :list-end-value-func
 			:accessor list-end-value-func)
    (list-end-indent :initform nil :initarg :list-end-indent
 		    :accessor list-end-indent)
-   (obj-start-fmtstr :type string :initform nil :initarg :obj-start-fmtstr
+   (obj-start-fmtstr :type (or string null) :initform nil :initarg :obj-start-fmtstr
 		     :accessor obj-start-fmtstr)
    (obj-start-value-func :initform nil :initarg :obj-start-value-func
 			 :accessor obj-start-value-func)
    (obj-start-indent :initform nil :initarg :obj-start-indent
 		     :accessor obj-start-indent)
-   (obj-end-fmtstr :type string :initform nil :initarg :obj-end-fmtstr
+   (obj-end-fmtstr :type (or string null) :initform nil :initarg :obj-end-fmtstr
 		   :accessor obj-end-fmtstr)
-   (obj-end-value-func :type function :initform nil
+   (obj-end-value-func :type (or function null) :initform nil
 		       :initarg :obj-end-value-func
 		       :accessor obj-end-value-func)
    (obj-end-indent :initform nil :initarg :obj-end-indent
 		   :accessor obj-end-indent)
    (obj-data-indent :initform nil :initarg :obj-data-indent
 		    :accessor obj-data-indent)
-   (obj-data-fmtstr :type string :initform nil :initarg :obj-data-fmtstr
+   (obj-data-fmtstr :type (or string null) :initform nil :initarg :obj-data-fmtstr
 		    :accessor obj-data-fmtstr)
-   (obj-data-end-fmtstr :type string :initform nil
+   (obj-data-end-fmtstr :type (or string null) :initform nil
 			:initarg :obj-data-end-fmtstr
 			:accessor obj-data-end-fmtstr)
-   (obj-data-value-func :type function :initform nil
+   (obj-data-value-func :type (or function null) :initform nil
 			:initarg :obj-data-value-func
 			:accessor obj-data-value-func)
    (link-slots :type list :initform nil
 	       :documentation "List of slot names that have hyperlinks"
 	       :accessor link-slots)
-   (link-page-name :type string :initform nil :initarg :link-page-name
+   (link-page-name :type (or string null) :initform nil :initarg :link-page-name
 		   :accessor link-page-name)
-   (link-href-start :type string :initform nil :initarg :link-href-start
+   (link-href-start :type (or string null) :initform nil :initarg :link-href-start
 		    :accessor link-href-start)
-   (link-href-end :type string :initform nil :initarg :link-href-end
+   (link-href-end :type (or string null) :initform nil :initarg :link-href-end
 		  :accessor link-href-end)
-   (link-ampersand :type string :initform nil :initarg :link-ampersand
+   (link-ampersand :type (or string null) :initform nil :initarg :link-ampersand
 		   :accessor link-ampersand))
   (:default-initargs :link-page-name "disp-func1")
   (:documentation "View class for a hyperobject"))
-- 
2.34.1