Author: rfm
Date: Wed Nov 18 11:43:24 2015
New Revision: 39173
URL: http://svn.gna.org/viewcvs/gnustep?rev=39173&view=rev
Log:
improve message when reading default value
Modified:
libs/ec/trunk/EcProcess.m
Modified: libs/ec/trunk/EcProcess.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcProcess.m?rev=39173&r1=39172&r2=39173&view=diff
==============================================================================
--- libs/ec/trunk/EcProcess.m (original)
+++ libs/ec/trunk/EcProcess.m Wed Nov 18 11:43:24 2015
@@ -3036,28 +3036,48 @@
{
NSString *mode = (NSString*)[msg objectAtIndex: 1];
NSString *key = (NSString*)[msg objectAtIndex: 2];
+ id old;
id val;
+ old = [cmdDefs objectForKey: key];
if ([mode caseInsensitiveCompare: @"delete"] == NSOrderedSame)
{
[cmdDefs setCommand: nil forKey: key];
+ val = [cmdDefs objectForKey: key];
}
else if ([msg count] > 2
&& [mode caseInsensitiveCompare: @"set"] == NSOrderedSame)
{
val = [msg objectAtIndex: 3];
[cmdDefs setCommand: val forKey: key];
- }
- val = [cmdDefs objectForKey: key];
- if (nil == val)
+ val = [cmdDefs objectForKey: key];
+ }
+ else
{
- [self cmdPrintf: @"The default setting for '%@' is removed.\n",
- key];
+ val = [cmdDefs objectForKey: key];
+ }
+ if (val == old || [val isEqual: old])
+ {
+ if (nil == val)
+ {
+ [self cmdPrintf: @"The default setting for '%@' is"
+ @" unchanged (and not set).\n", key];
+ }
+ else
+ {
+ [self cmdPrintf: @"The default setting for '%@' is"
+ @" unchanged (%@).\n", key, val];
+ }
+ }
+ else if (nil == val)
+ {
+ [self cmdPrintf: @"The default setting for '%@' is"
+ @" deleted (was %@).\n", key, val];
}
else
{
- [self cmdPrintf: @"The default setting for '%@' is now:\n%@\n",
- key, val];
+ [self cmdPrintf: @"The default setting for '%@' is"
+ @" set to: %@ (was %@).\n", key, val, old];
}
}
else
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
