3 files changed, 5 insertions, 4 deletions

diff --git a/src/macfont.m b/src/macfont.m
index dccb4e6fd02..be8153390d2 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -410,8 +410,9 @@ mac_font_shape_1 (NSFont *font, NSString *string,
       /* For now we assume the direction is not changed within the
          string.  */
       [layoutManager getGlyphsInRange:(NSMakeRange (glyphIndex, 1))
-                               glyphs:NULL characterIndexes:NULL
-                    glyphInscriptions:NULL elasticBits:NULL
+                               glyphs:NULL
+                           properties:NULL
+                     characterIndexes:NULL
                            bidiLevels:&bidiLevel];
       if (bidiLevel & 1)
         permutation = xmalloc (sizeof (NSUInteger) * used);
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 5e863bb17d7..8dcbe194d57 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -750,7 +750,7 @@ x_activate_menubar (struct frame *f)
                          modifierFlags: 0
                              timestamp: [e timestamp]
                           windowNumber: [[view window] windowNumber]
-                               context: [e context]
+                               context: nil
                            eventNumber: 0/*[e eventNumber] */
                             clickCount: 1
                               pressure: 0];
diff --git a/src/nsterm.m b/src/nsterm.m
index 785147ae8d0..8b0c3cf249e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8602,7 +8602,7 @@ not_in_argv (NSString *arg)
                                  modifierFlags: [e modifierFlags]
                                      timestamp: [e timestamp]
                                   windowNumber: [e windowNumber]
-                                       context: [e context]
+                                       context: nil
                                    eventNumber: [e eventNumber]
                                     clickCount: [e clickCount]
                                       pressure: [e pressure]];