Merge branch 'dr/dev' of git@github.com:davidswelt/aquamacs-emacs int…

…o dr/dev Conflicts: src/nsterm.m
aquamacs-emacs · Aug 6, 2009 · 8978281 · 8978281
2 parents 9be94c8 + bdd9f39
commit 8978281
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/nsterm.m b/src/nsterm.m
@@ -3579,6 +3579,7 @@ We tell read_avail_input() that input is "expected" because we do expect
   if (f->async_visible)
     {
       EmacsView *view = FRAME_NS_VIEW (f);
+      NSDictionary *opts = nil;
 
       if ([view respondsToSelector:@selector(exitFullScreenModeWithOptions:)])
 	{