From 7f8dba0b2fd57c2e3afcfe1d8d08682c35a96826 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Sun, 23 Dec 2001 02:15:40 +0000 Subject: [PATCH] [writeSelectionToPasteboard:types:] corrected C binary operator short cut logic that prevented us froam adding more than one string type to the pasteboard. Remember that || wont evaluate the second operand if the first is true. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11885 72102866-910b-0410-8b05-ffd578937521 --- Source/NSTextView.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/NSTextView.m b/Source/NSTextView.m index 4d14c54d9..b0239c908 100644 --- a/Source/NSTextView.m +++ b/Source/NSTextView.m @@ -3477,20 +3477,20 @@ other than copy/paste or dragging. */ { if ([type isEqualToString: NSStringPboardType]) { - ret = ret || [pboard setString: [[self string] substringWithRange: _selected_range] - forType: NSStringPboardType]; + ret = [pboard setString: [[self string] substringWithRange: _selected_range] + forType: NSStringPboardType] || ret; } if ([type isEqualToString: NSRTFPboardType]) { - ret = ret || [pboard setData: [self RTFFromRange: _selected_range] - forType: NSRTFPboardType]; + ret = [pboard setData: [self RTFFromRange: _selected_range] + forType: NSRTFPboardType] || ret; } if ([type isEqualToString: NSRTFDPboardType]) { - ret = ret || [pboard setData: [self RTFDFromRange: _selected_range] - forType: NSRTFDPboardType]; + ret = [pboard setData: [self RTFDFromRange: _selected_range] + forType: NSRTFDPboardType] || ret; } if ([type isEqualToString: NSColorPboardType])