Merge branch 'master' of github.com:gnustep/libs-base into UnitsOfMeasure

ChangeLog

@@ -1,3 +1,9 @@
+2019-10-02  Frederik Seiffert <frederik@algoriddim.com>
+
+	* Source/NSDictionary.m: fixed mutable dictionary keyed subscript
+	behavior: assigning nil value via keyed subscript now correctly
+	removes object for key.
+
 2019-09-25  Frederik Seiffert <frederik@algoriddim.com>
 
 	* Headers/Foundation/NSProcessInfo.h:

Headers/Foundation/NSFilePresenter.h

@@ -39,11 +39,11 @@ DEFINE_BLOCK_TYPE(GSFilePresentedItemChangesWithCompletionHandler, void, NSError
 
 @protocol NSFilePresenter <NSObject>
 
-@required
+// @required
 - (NSURL *) presentedItemURL;
 - (NSOperationQueue *) presentedItemOperationQueue;
 
-@optional
+// @optional
 - (NSURL *) primaryPresentedItemURL;
 - (NSString *) observedPresentedItemUbiquityAttributes;
 

Makefile.postamble

@@ -99,10 +99,14 @@ ifeq ($(_have_makefiles),yes)
 config.mak: config.status config.mak.in
 	@./$< $@
 
-base.make: config.status base.make.in Version
 # If Version is newer than the target, configure must be rerun so that
 # its variables get AC_SUBST'ed and actually updated in base.make.
-	@if [ Version -nt $@ ]; then ./configure; else ./$< $@; fi
+base.make:: Version
+	@./configure
+
+# Normally (Version unchanged) config.status can regenerate base.make.
+base.make:: config.status base.make.in
+	@./$< $@
 
 config.status: configure
 	@if [ -f $@ ]; then ./$@ --recheck; else ./$<; fi

Source/NSDictionary.m

@@ -1350,7 +1350,14 @@ compareIt(id o1, id o2, void* context)
 
 - (void) setObject: (id)anObject forKeyedSubscript: (id)aKey
 {
-  [self setObject: anObject forKey: aKey];
+  if (anObject == nil)
+    {
+      [self removeObjectForKey: aKey];
+    }
+  else
+    {
+      [self setObject: anObject forKey: aKey]; 
+    }
 }
 
 /**