[Openmcl-cvs-notifications] r16267 - in /release/1.10/source: ./ cocoa-ide/apropos-window.lisp

rme at clozure.com rme at clozure.com
Mon Sep 29 20:00:08 UTC 2014


Author: rme
Date: Mon Sep 29 20:00:07 2014
New Revision: 16267

Log:
Merge apropos window fix here.

Modified:
    release/1.10/source/   (props changed)
    release/1.10/source/cocoa-ide/apropos-window.lisp

Propchange: release/1.10/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Sep 29 20:00:07 2014
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:16167,16171,16173,16176-16177,16181-16182,16184-16185,16189-=
16190,16193,16227-16228
+/trunk/source:16167,16171,16173,16176-16177,16181-16182,16184-16185,16189-=
16190,16193,16227-16228,16248

Modified: release/1.10/source/cocoa-ide/apropos-window.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.10/source/cocoa-ide/apropos-window.lisp	(original)
+++ release/1.10/source/cocoa-ide/apropos-window.lisp	Mon Sep 29 20:00:07 2=
014
@@ -173,7 +173,8 @@
 						       combo-box
 						       (index :<NSI>nteger))
   (with-slots (packages) combo-box
-    (let* ((pkg-name (package-name (svref packages index))))
+    (let* ((pkg-name (and packages
+			  (package-name (svref packages index)))))
       (if pkg-name
 	(#/autorelease (%make-nsstring pkg-name))
 	+null-ptr+))))



More information about the Openmcl-cvs-notifications mailing list