Date: Monday, December 20, 2010 @ 08:40:22 Author: rtoy Path: /project/cmucl/cvsroot/src/pcl Tag: cross-sol-x86-branch

Modified: cmucl-documentation.lisp

Merge fix from HEAD branch.

--------------------------+ cmucl-documentation.lisp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Index: src/pcl/cmucl-documentation.lisp diff -u src/pcl/cmucl-documentation.lisp:1.17 src/pcl/cmucl-documentation.lisp:1.17.8.1 --- src/pcl/cmucl-documentation.lisp:1.17 Fri Mar 19 11:19:03 2010 +++ src/pcl/cmucl-documentation.lisp Mon Dec 20 08:40:22 2010 @@ -4,7 +4,7 @@ ;;; the public domain, and is provided 'as is'.

(file-comment - "$Header: /project/cmucl/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.17 2010-03-19 15:19:03 rtoy Rel $") + "$Header: /project/cmucl/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.17.8.1 2010-12-20 13:40:22 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -222,7 +222,7 @@ `(defmethod documentation :around ((x t) (doc-type (eql ',dt))) (let ((doc (call-next-method)) (domain (info ,dt :textdomain x))) - (or (intl:dgettext domain doc) + (or (and doc (intl:dgettext domain doc)) doc))))) (frob function) (frob setf)