[Pkg] The Trunk: Morphic-ul.524.mcz

[commits at source.squeak.org]

Levente Uzonyi uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-ul.524.mcz

==================== Summary ====================

Name: Morphic-ul.524
Author: ul
Time: 7 March 2011, 4:41:33.144 pm
UUID: b2d07f0b-1f7a-c648-8df1-7040840c1851
Ancestors: Morphic-cmm.523, Morphic-cao.522

Merged.

=============== Diff against Morphic-cmm.523 ===============

Item was changed:
  ----- Method: StringMorph>>contents: (in category 'accessing') -----
  contents: newContents 
  	| scanner |
  	contents := newContents isText
  				ifTrue: [scanner := StringMorphAttributeScanner new initializeFromStringMorph: self.
  					(newContents attributesAt: 1 forStyle: self font textStyle)
  						do: [:attr | attr emphasizeScanner: scanner].
  					emphasis := scanner emphasis.
+ 					font := scanner font.
- 					font := scanner font emphasis: emphasis.
  					color := scanner textColor.
  					newContents string]
  				ifFalse: [contents = newContents
  						ifTrue: [^ self].
  					"no substantive change"
  					newContents].
  	self fitContents!